aboutsummaryrefslogtreecommitdiff
path: root/doc/setup.mdwn
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-07-26 21:00:11 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-07-26 21:00:11 -0400
commitc83fd4a32868d46765a88f6903dd807f18c9ae84 (patch)
tree8caffbf1eee77601014d4e58833e74e5cc55891c /doc/setup.mdwn
parent4604fadf0acb92ec3e64092bcd9e76eae93b93b2 (diff)
downloadikiwiki-c83fd4a32868d46765a88f6903dd807f18c9ae84.tar
ikiwiki-c83fd4a32868d46765a88f6903dd807f18c9ae84.tar.gz
wrapper setup reorg
Flattened the wrapper setup, as this lets it be handled better by the setup generation code.
Diffstat (limited to 'doc/setup.mdwn')
-rw-r--r--doc/setup.mdwn10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 565711111..9c67c2a6c 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -101,7 +101,7 @@ 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
-block for the cgi wrapper, make sure the filename for the cgi wrapper
+settings for the `cgi_wrapper`, make sure the filename for the cgi wrapper
is ok, run `ikiwiki --setup ikiwiki.setup`, and you're done!
There are lots of other configuration options in ikiwiki.setup that you
@@ -193,11 +193,11 @@ 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, and uncomment the lines for the revision control system
+ikiwiki.setup, set `rcs` to the the revision control system
you chose to use. Be sure to set `svnrepo` to $REPOSITORY, if using
-subversion. Uncomment the block for the wrapper for your revision
-control system, and configure the wrapper path in that block
-appropriately (for Git, it should be `$REPOSITORY/hooks/post-update`).
+subversion. Uncomment the configuration for the wrapper for your revision
+control system, and configure the wrapper path appropriately
+(for Git, it should be `$REPOSITORY/hooks/post-update`).
Once it's all set up, run `ikiwiki --setup ikiwiki.setup` once more.
Now you should be able to edit files in $SRCDIR, and use your revision