diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/setup.mdwn | 14 |
2 files changed, 10 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 729f55849..127c09361 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ ikiwiki (2.60) UNRELEASED; urgency=low * websetup: New plugin providing a setup form on the web. * ikiwiki-makerepo: Bail if both srcdir and repository are not specified. Closes: #493628 + * Clarify some wording in the setup documentation that could maybe lead + users to putting paths with "~/" in the setup file, which doesn't work. + Closes: #493835 -- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2008 11:35:46 -0400 diff --git a/doc/setup.mdwn b/doc/setup.mdwn index 2d3942124..647e8b86f 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -207,13 +207,13 @@ about using the git repositories. ## Configure ikiwiki to use revision control. -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 sure to set `svnrepo` to $REPOSITORY, if using -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 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 sure to set +`svnrepo` to the directory for your repository, if using subversion. +Uncomment the configuration for the wrapper for your revision control +system, and configure the wrapper path appropriately (for Git, it should be +the path to `hooks/post-update` inside the bare git repository). 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 |