Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[ikiwiki.git] / doc / setup.mdwn

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index bc93da7b39d52e525f7488b548d98b4423f6b220..2d39421242cb3d8c7df9316bfc2b682fc4e675d4 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -9,12 +9,14 @@ If you're not, see the [[download]] and [[install]] pages.
 
 ## 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
 
 Wait for it to tell you an url for your new wiki.. Done!