finish including hnb plugin

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

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 857a9dbae01bd0323afbc309306c36061544d417..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,


@@ -135,10 +138,9 @@ about using the git repositories.
        ikiwiki-makerepo mercurial $SRCDIR
 """]]
 
        ikiwiki-makerepo mercurial $SRCDIR
 """]]
 

-[[toggle id=mercurial text="Bazaar"]]
+[[toggle id=bazaar text="Bazaar"]]

 [[toggleable id=bazaar text="""
        REPOSITORY=$SRCDIR
 [[toggleable id=bazaar text="""
        REPOSITORY=$SRCDIR

-       # FIXME: doesn't work yet with bzr

        ikiwiki-makerepo bzr $SRCDIR
 """]]
 
        ikiwiki-makerepo bzr $SRCDIR
 """]]
 


@@ -187,7 +189,8 @@ 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. Uncomment the block for the wrapper for your revision
+you chose to use. Be sure to set `svnrepo` to $REPOSITORY, if using
+subversion. 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`).