Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / doc / setup.mdwn

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 7e8973bbc1a519c208a5862d241badefbfdf7218..7f3f6840df1e06ecf2748c129539a7abfe990c32 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -41,7 +41,7 @@ In the editor, you could start by entering a simple page like
        This wiki is powered by [ikiwiki](http://ikiwiki.info).
 """]]
    
-See [[HelpOnFormatting]] for details about the markup language.
+See [[ikiwiki/formatting]] for details about the markup language.
 
 Note that several [[standard_wiki_pages|basewiki]] will be added to your
 wiki, from files in `/usr/share/ikiwiki/basewiki/`, so your wiki will
@@ -124,9 +124,9 @@ revision control.
        REPOSITORY=~/wiki.git
        ikiwiki-makerepo git $SRCDIR $REPOSITORY
 
-       Please see [[rcs/git]] for detailed documentation about how
-       ikiwiki uses git repositories, and some important caveats
-       about using the git repositories.
+Please see [[rcs/git]] for detailed documentation about how
+ikiwiki uses git repositories, and some important caveats
+about using the git repositories.
 """]]
 
 [[toggle id=mercurial text="Mercurial"]]
@@ -135,6 +135,12 @@ revision control.
        ikiwiki-makerepo mercurial $SRCDIR
 """]]
 
+[[toggle id=bazaar 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 @@ 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, 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`).