X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/1916afc60321a420545d65929974ea06491dde85..15ed67132ee70a3c9c98565dee464a8f968c765c:/doc/setup.mdwn diff --git a/doc/setup.mdwn b/doc/setup.mdwn index 2989485f9..647e8b86f 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -9,8 +9,9 @@ If you're not, see the [[download]] and [[install]] pages. ## Quick start -If you'd like to set up a wiki now, and learn more later, just run this command -and answer a couple of questions. +If you'd like to set up a wiki now, and learn more later, and you have +ikiwiki 2.60 or better installed, just run this command and answer a couple +of questions. % ikiwiki -setup /etc/ikiwiki/auto.setup What will the wiki be named? mywiki @@ -206,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