X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/16b0e475487911790fae1b78a89ce94477eb970a..6317ee847be90291b93a43507c182a7834bf0f8d:/doc/setup/byhand.mdwn

diff --git a/doc/setup/byhand.mdwn b/doc/setup/byhand.mdwn
index 53f8d18bb..6d0f37cd9 100644
--- a/doc/setup/byhand.mdwn
+++ b/doc/setup/byhand.mdwn
@@ -93,9 +93,15 @@ will set everything up.
 
 ## Turn on additional features.
 
+[[!template id="note" text="""
+CGI configuration is heavily dependent on webserver. Figure out (or
+configure) the location and/or filename extension your webserver
+needs to execute a CGI, then set `cgi_wrapper` to a suitable path.
+"""]]
+
 Now you have a basic wiki with a setup file. Time to experiment
 with ikiwiki's many features. 
-   
+
 Let's first enable a key wiki feature and set up [[CGI]] to allow
 editing the wiki from the web. Just edit ikiwiki.setup, uncomment the
 settings for the `cgi_wrapper`, make sure the filename for the cgi wrapper
@@ -104,7 +110,7 @@ is ok, run `ikiwiki --setup ikiwiki.setup`, and you're done!
 There are lots of other configuration options in ikiwiki.setup that you
 can uncomment, configure, and enable by re-running
 `ikiwiki --setup ikiwiki.setup`. Be sure to browse through all the
-[[plugins]]..
+[[plugins]].
 
 ## Put your wiki in revision control.
 
@@ -124,6 +130,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 +183,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