releasing version 2.31.1

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

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 39a3a174d9eeacddb537ab465799388c5a54be9f..9d7aecabdf26bb53b27794fe5056217cffe84146 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).
 """]]
    
        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
 
 Note that several [[standard_wiki_pages|basewiki]] will be added to your
 wiki, from files in `/usr/share/ikiwiki/basewiki/`, so your wiki will


@@ -135,6 +135,12 @@ about using the git repositories.
        ikiwiki-makerepo mercurial $SRCDIR
 """]]
 
        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
 [[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
 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`).
 
 control system, and configure the wrapper path in that block
 appropriately (for Git, it should be `$REPOSITORY/hooks/post-update`).