diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-01-29 14:45:58 -0500 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-01-29 14:45:58 -0500 |
| commit | e37a0812b0dd88ae478fd5c28f4009e93709b31f (patch) | |
| tree | 2568697b16cae962095aae71d8d44452166eaa36 | |
| parent | 78529b335c786a2e988e71a31827929a84da2b6d (diff) | |
| parent | a46cf100f01b5db96980737b1c2b25deff68e5a0 (diff) | |
| download | ikiwiki-e37a0812b0dd88ae478fd5c28f4009e93709b31f.tar ikiwiki-e37a0812b0dd88ae478fd5c28f4009e93709b31f.tar.gz | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
| -rw-r--r-- | doc/plugins/textile/discussion.mdwn | 1 | ||||
| -rw-r--r-- | doc/setup/byhand.mdwn | 11 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/plugins/textile/discussion.mdwn b/doc/plugins/textile/discussion.mdwn deleted file mode 100644 index 945c9b46d..000000000 --- a/doc/plugins/textile/discussion.mdwn +++ /dev/null @@ -1 +0,0 @@ -.
\ No newline at end of file diff --git a/doc/setup/byhand.mdwn b/doc/setup/byhand.mdwn index 9a2e1f3e9..0184d3d2a 100644 --- a/doc/setup/byhand.mdwn +++ b/doc/setup/byhand.mdwn @@ -171,11 +171,12 @@ 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 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). +`rcs` to the 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 +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 |