Merge commit 'upstream/master'

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

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 09ca550384f90f59466e1acbd0d2bdc49707f2a2..1b8e4b12a723797876c01e598f2d881927834cc7 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -9,10 +9,11 @@ If you're not, see the [[download]] and [[install]] pages.
 
 ## Quick start
 
 
 ## Quick start
 

-If you'd like to set up a wiki now, and learn more later, just run this command
-and answer a couple of questions.
+If you'd like to set up a wiki now, and learn more later, and you have
+ikiwiki 2.60 or better installed, just run this command and answer a couple
+of questions.

 
 

-       % ikiwiki -setup /etc/ikiwiki/simple.setup
+       % ikiwiki -setup /etc/ikiwiki/auto.setup

        What will the wiki be named? mywiki
        What revision control system to use? git
        What wiki user (or openid) will be wiki admin? joey
        What will the wiki be named? mywiki
        What revision control system to use? git
        What wiki user (or openid) will be wiki admin? joey


@@ -20,7 +21,7 @@ and answer a couple of questions.
 Wait for it to tell you an url for your new wiki.. Done!
 
 (If the CGI doesn't seem to let you edit pages, you might need to
 Wait for it to tell you an url for your new wiki.. Done!
 
 (If the CGI doesn't seem to let you edit pages, you might need to

-[[configure_apache|apache_cgi]]).)
+[[configure_apache|tips/apache_cgi]] or [[configure_lighttpd|tips/lighttpd_cgi]].)

 
 ## Decide where your wiki's files will go.
 
 
 ## Decide where your wiki's files will go.
 


@@ -180,39 +181,20 @@ about using the git repositories.
 
 [[!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
-       BRANCH=com.company.wikiname
-       # 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@example.com
-       mtn db init --db=$REPOSITORY
-       mv $SRCDIR $SRCDIR-old
-       cd $SRCDIR-old
-       echo ".ikiwiki" > $SRCDIR-old/.mtn-ignore
-       mtn --db=$REPOSITORY --branch=$BRANCH import . -m "initial import"
-       cd ..
-       mtn --db=$REPOSITORY --branch=$BRANCH checkout $SRCDIR
-       mv $SRCDIR-old/.ikiwiki $SRCDIR
-       cat << EOF > $SRCDIR/_MTN/monotonerc
-       function get_passphrase (branchname)
-           return "wikiKeyPass"
-       end
-       EOF
-       rm -r $SRCDIR-old
+       # This assumes that you have already used "mtn genkey you@hostname".
+       REPOSITORY=~/wiki.monotone
+       ikiwiki-makerepo monotone $SRCDIR $REPOSITORY

 """]]
 
 ## Configure ikiwiki to use revision control.
 
 """]]
 
 ## Configure ikiwiki to use revision control.
 

-Once your wiki is checked in to the revision control system,
-you should configure ikiwiki to use revision control. Edit your
-ikiwiki.setup, set `rcs` to the the revision control system
-you chose to use. Be sure to set `svnrepo` to $REPOSITORY, if using
-subversion. Uncomment the configuration for the wrapper for your revision
-control system, and configure the wrapper path appropriately
-(for Git, it should be `$REPOSITORY/hooks/post-update`).
+Once your wiki is checked in to the revision control system, you should
+configure ikiwiki to use revision control. Edit your ikiwiki.setup, set
+`rcs` to the the revision control system you chose to use. Be sure to set
+`svnrepo` to the directory for your repository, if using subversion.
+Uncomment the configuration for the wrapper for your revision control
+system, and configure the wrapper path appropriately (for Git, it should be
+the path to `hooks/post-update` inside the bare git repository).

 
 Once it's all set up, run `ikiwiki --setup ikiwiki.setup` once more.
 Now you should be able to edit files in $SRCDIR, and use your revision
 
 Once it's all set up, run `ikiwiki --setup ikiwiki.setup` once more.
 Now you should be able to edit files in $SRCDIR, and use your revision