(no commit message)

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

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 39a3a174d9eeacddb537ab465799388c5a54be9f..174d6ceb972d8c38f17b021246244e05052a9317 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -1,9 +1,12 @@
 This tutorial will walk you through setting up a wiki with ikiwiki.
 
-[[toc ]]
+[[!toc ]]
 
 ## [[Download]] and [[install]] ikiwiki.
 
+If you're using Debian or Ubuntu, ikiwiki is an `apt-get install ikiwiki` away.
+If you're not, see the [[download]] and [[install]] pages.
+
 ## Decide where your wiki's files will go.
 
 As a wiki compiler, ikiwiki builds a wiki from files in a source directory,
@@ -29,8 +32,8 @@ This will create a simple main page for the wiki.
        $EDITOR index.mdwn
 
 In the editor, you could start by entering a simple page like
-[[toggle id=page text="this one"]].
-[[toggleable id=page text="""
+[[!toggle id=page text="this one"]].
+[[!toggleable id=page text="""
        Welcome to your new wiki.
 
        All wikis are supposed to have a \[[SandBox]],
@@ -41,7 +44,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
@@ -113,14 +116,14 @@ should be preserved, but not checked into revision control.
 The new [[ikiwiki-makerepo]] command automates setting up a wiki in
 revision control.
 
-[[toggle id=subversion text="Subversion"]]
-[[toggleable id=subversion text="""
+[[!toggle id=subversion text="Subversion"]]
+[[!toggleable id=subversion text="""
        REPOSITORY=~/wikirepo
        ikiwiki-makerepo svn $SRCDIR $REPOSITORY
 """]]
 
-[[toggle id=git text="Git"]]
-[[toggleable id=git text="""
+[[!toggle id=git text="Git"]]
+[[!toggleable id=git text="""
        REPOSITORY=~/wiki.git
        ikiwiki-makerepo git $SRCDIR $REPOSITORY
 
@@ -129,14 +132,20 @@ ikiwiki uses git repositories, and some important caveats
 about using the git repositories.
 """]]
 
-[[toggle id=mercurial text="Mercurial"]]
-[[toggleable id=mercurial text="""
+[[!toggle id=mercurial text="Mercurial"]]
+[[!toggleable id=mercurial text="""
        REPOSITORY=$SRCDIR
        ikiwiki-makerepo mercurial $SRCDIR
 """]]
 
-[[toggle id=tla text="TLA"]]
-[[toggleable id=tla text="""
+[[!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
        tla make-archive me@localhost--wiki $REPOSITORY
        tla my-id "<me@localhost>"
@@ -149,8 +158,8 @@ about using the git repositories.
        tla import
 """]]
 
-[[toggle id=monotone text="Monotone"]]
-[[toggleable id=monotone text="""
+[[!toggle id=monotone text="Monotone"]]
+[[!toggleable id=monotone text="""
        # These instructions are standard instructions to import a directory into monotone
        # and set it up so that you don't need any passwords to use it
        REPOSITORY=~/.ikiwiki/mtn.db