test 2

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

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 7e8973bbc1a519c208a5862d241badefbfdf7218..ed15da274f8c75137ba2170effabb4a722e78a09 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -4,6 +4,9 @@ This tutorial will walk you through setting up a wiki with ikiwiki.
 
 ## [[Download]] and [[install]] ikiwiki.
 
 
 ## [[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,
 ## Decide where your wiki's files will go.
 
 As a wiki compiler, ikiwiki builds a wiki from files in a source directory,


@@ -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).
 """]]
    
        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


@@ -124,9 +127,9 @@ revision control.
        REPOSITORY=~/wiki.git
        ikiwiki-makerepo git $SRCDIR $REPOSITORY
 
        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"]]
 """]]
 
 [[toggle id=mercurial text="Mercurial"]]


@@ -135,6 +138,12 @@ revision control.
        ikiwiki-makerepo mercurial $SRCDIR
 """]]
 
        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
 [[toggle id=tla text="TLA"]]
 [[toggleable id=tla text="""
        REPOSITORY=~/wikirepo