make monotone use hooks, add getsetup

[ikiwiki.git] / doc / setup.mdwn

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index ed15da274f8c75137ba2170effabb4a722e78a09..ac65911fbd974b98303bdb670c8cab5e44d33771 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -1,6 +1,6 @@
 This tutorial will walk you through setting up a wiki with ikiwiki.
 
-[[toc ]]
+[[!toc ]]
 
 ## [[Download]] and [[install]] ikiwiki.
 
@@ -32,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]],
@@ -116,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
 
@@ -132,20 +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=bazaar text="Bazaar"]]
-[[toggleable id=bazaar 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="""
+[[!toggle id=tla text="TLA"]]
+[[!toggleable id=tla text="""
        REPOSITORY=~/wikirepo
        tla make-archive me@localhost--wiki $REPOSITORY
        tla my-id "<me@localhost>"
@@ -158,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
@@ -167,7 +167,7 @@ about using the git repositories.
        # remember the password you use in the next step and
        # substitute it for 'wikiKeyPass' in the get_passphrase() hook below
        # note the you should never generate two monotone keys with the same name
-       mtn genkey web@machine.company.com
+       mtn genkey web@example.com
        mtn db init --db=$REPOSITORY
        mv $SRCDIR $SRCDIR-old
        cd $SRCDIR-old