aboutsummaryrefslogtreecommitdiff
path: root/doc/setup.mdwn
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-10-05 11:29:44 -0400
committerJoey Hess <joey@kitenet.net>2010-10-05 11:29:44 -0400
commit06b28dddecce8d27c0b556c883b8721aee1d3dc9 (patch)
tree69451a53b452729420a1674535d934eaebb89d77 /doc/setup.mdwn
parentfe582418d21f8b619db872b84bc718459325bd15 (diff)
parent46a98c8a4d72e8be0fd5e683a83745d529b2c3c3 (diff)
downloadikiwiki-06b28dddecce8d27c0b556c883b8721aee1d3dc9.tar
ikiwiki-06b28dddecce8d27c0b556c883b8721aee1d3dc9.tar.gz
Merge branch 'master' into revert
Conflicts: doc/todo/web_reversion.mdwn
Diffstat (limited to 'doc/setup.mdwn')
-rw-r--r--doc/setup.mdwn4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index ac491baae..40581eb72 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -22,6 +22,8 @@ Or, set up a blog with ikiwiki, run this command instead.
% ikiwiki -setup /etc/ikiwiki/auto-blog.setup
+`librpc-xml-perl` and `python-docutils` dependencies are needed.
+
Either way, it will ask you a couple of questions.
What will the wiki be named? foo
@@ -130,7 +132,7 @@ old location won't work, and the easiest way to deal with this is to delete
them and re-checkout from the new repository location.
% rm -rf foo
- % git clone /src/git/foo.git
+ % git clone /srv/git/foo.git
Finally, edit the setup file. Modify the settings for `srcdir`, `destdir`,
`url`, `cgiurl`, `cgi_wrapper`, `git_wrapper`, etc to reflect where