summaryrefslogtreecommitdiff
path: root/doc/setup.mdwn
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-02-05 15:59:42 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-02-05 15:59:42 -0500
commitf92505d78b82c6ac146e43054ebd12441575a602 (patch)
tree2897a21c04f473ee3100a6a59ccce6336a1f7692 /doc/setup.mdwn
parentfbe2ab4419e086ff84991bf25f1549aaabc5143b (diff)
parent11f4942d68f3276bfdc4688e4091e559f9481874 (diff)
Merge branch 'master' into prefix-directives
Diffstat (limited to 'doc/setup.mdwn')
-rw-r--r--doc/setup.mdwn9
1 files changed, 7 insertions, 2 deletions
diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index af1adc235..9d7aecabd 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -135,6 +135,12 @@ about using the git repositories.
ikiwiki-makerepo mercurial $SRCDIR
"""]]
+[[toggle id=mercurial text="Bazaar"]]
+[[toggleable id=bazaar text="""
+ REPOSITORY=$SRCDIR
+ ikiwiki-makerepo bzr $SRCDIR
+"""]]
+
[[toggle id=tla text="TLA"]]
[[toggleable id=tla text="""
REPOSITORY=~/wikirepo
@@ -180,8 +186,7 @@ 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
-you chose to use. Be sure to set `svnrepo` to $REPOSITORY, if using
-subversion. Uncomment the block for the wrapper for your revision
+you chose to use. 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`).