From: Joey Hess Date: Tue, 7 Feb 2012 06:20:09 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Tag: 3.20120203~175 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/742579e1096caf1ae63ab100ff446fe3818402b2?hp=6320bfcb37aaad1c485a43d3b5217a01e1b281f7 Merge branch 'master' of ssh://git.ikiwiki.info --- diff --git a/doc/ikiwiki-makerepo.mdwn b/doc/ikiwiki-makerepo.mdwn index 61ca8e6fa..eccfb692a 100644 --- a/doc/ikiwiki-makerepo.mdwn +++ b/doc/ikiwiki-makerepo.mdwn @@ -21,7 +21,7 @@ made into a clone of it. (monotone and darcs are similar.) For svn and cvs, the `repo` is the centralized repository, and the `srcdir` is a checkout of it. -For for mercurial and bzr, the srcdir is the only repository set up. +For mercurial and bzr, the srcdir is the only repository set up. For darcs, the master repo's apply hook will be preconfigured to call a ikiwiki wrapper.