X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9dd52850252fc3ad5961277db586cb29eb5d42bd..72b2cba709e8ddae09107a366dbfc8c197cf6064:/doc/rcs/details.mdwn

diff --git a/doc/rcs/details.mdwn b/doc/rcs/details.mdwn
index 6b9ffb91f..e62f3ef49 100644
--- a/doc/rcs/details.mdwn
+++ b/doc/rcs/details.mdwn
@@ -1,6 +1,6 @@
 A few bits about the RCS backends
 
-[[toc ]]
+[[!toc ]]
 
 ## Terminology
 
@@ -117,6 +117,14 @@ towards transmitting changes with standalone patch bundles (often by email) as d
 >> plugin in [[todo/darcs]], if you submit one that's complete, I will
 >> probably accept it into ikiwiki.. --[[Joey]]
 
+>>> I'd like to help make a robust darcs (2) backend. I also think ikiwiki should use 
+>>> 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_Michael]]
+>>> PS ah, there it is. Let's continue on the [[todo/darcs]] page.
+
+
 ## [[Git]]
 
 Regarding the Git support, Recai says:
@@ -258,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:
 
@@ -352,3 +359,5 @@ merge again with a merger that inserts conflict markers.  It commits this new
 revision with conflict markers to the repository.  It then returns the text to the
 user for cleanup.  This is less neat than it could be, in that a conflict marked
 revision gets committed to the repository.
+
+## [[bzr]]