Merge remote branch 'upstream/master' into prv/po

[git.ikiwiki.info.git] / doc / setup / byhand.mdwn

diff --git a/doc/setup/byhand.mdwn b/doc/setup/byhand.mdwn
index 53f8d18bb343f1441dbd3e52a5948f2532631ecb..86cff5af4e58696eb8ada93e5b35771406ed421e 100644 (file)
--- a/doc/setup/byhand.mdwn
+++ b/doc/setup/byhand.mdwn
@@ -124,6 +124,12 @@ revision control.
        ikiwiki-makerepo svn $SRCDIR $REPOSITORY
 """]]
 
+[[!toggle id=cvs text="CVS"]]
+[[!toggleable id=cvs text="""
+       REPOSITORY=~/wikirepo
+       ikiwiki-makerepo cvs $SRCDIR $REPOSITORY
+"""]]
+
 [[!toggle id=git text="Git"]]
 [[!toggleable id=git text="""
        REPOSITORY=~/wiki.git
@@ -171,7 +177,7 @@ about using the git repositories.
 
 Once your wiki is checked in to the revision control system, you should
 configure ikiwiki to use revision control. Edit your ikiwiki.setup, set
-`rcs` to the the revision control system you chose to use.  Be careful, 
+`rcs` to the revision control system you chose to use.  Be careful, 
 you may need to use the 'fullname'.  For example, 'hg' doesn't work, you
 should use mercurial.  Be sure to set `svnrepo` to the directory for your
 repository, if using subversion. Uncomment the configuration for the wrapper