Note about prefix_directives

[ikiwiki.git] / doc / rcs / details.mdwn

diff --git a/doc/rcs/details.mdwn b/doc/rcs/details.mdwn
index 62335a7ce0fb2adc9873ae9b5fedfe67345f74ff..089221caba26027cb013ea69fd4650cb0ae8c44b 100644 (file)
--- a/doc/rcs/details.mdwn
+++ b/doc/rcs/details.mdwn
@@ -1,6 +1,6 @@
 A few bits about the RCS backends
 
-[[toc ]]
+[[!toc ]]
 
 ## Terminology
 
@@ -121,8 +121,8 @@ towards transmitting changes with standalone patch bundles (often by email) as d
 >>> exactly one darcs repo. I think we can simplify and say conflicting web
 >>> edits are not allowed, like most current wiki engines. I don't see that 
 >>> saving (so much) context in the html is necessary, then. 
->>> bma, I would like to see your code. --[[simon]]
->>> PS aha, there it is. Let's continue on the [[todo/darcs]] page.
+>>> bma, I would like to see your code. --[[Simon_Michael]]
+>>> PS ah, there it is. Let's continue on the [[todo/darcs]] page.
 
 
 ## [[Git]]
@@ -266,8 +266,7 @@ on the same local machine, I suggest to create the latter with the "`git clone -
 command to save disk space.
 
 Note that, as a rule of thumb, you should always put the rcs wrapper (`post-update`)
-into the master repository (`.git/hooks/`) as can be noticed in the Git wrappers of
-the sample [[ikiwiki.setup]].
+into the master repository (`.git/hooks/`).
 
 Here is how a web edit works with ikiwiki and git:
 
@@ -281,6 +280,9 @@ Here is a how a commit from a remote repository works:
 
 * git-commit in the remote repository
 * git-push, pushes the commit to the master repo on the server
+* (Optionally, the master repo's pre-receive hook runs, and checks that the
+  update only modifies files that the pushing user is allowed to update. 
+  If not, it aborts the receive.)
 * the master repo's post-update hook notices this update, and runs ikiwiki
 * ikiwiki notices the modifies page source, and compiles it