X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ac36a6b50aa880ab7de984cf7c4b1d3041ee55cf..6f858cd59f6bb0734da499b88f385fb6a61ac48e:/doc/rcs/details.mdwn?ds=sidebyside diff --git a/doc/rcs/details.mdwn b/doc/rcs/details.mdwn index 62335a7ce..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 @@ -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: