get rid of diag explain again

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

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 89444c9a861e35f5067994bd5b760670db6acce6..ce51faa6d47688754acc04f08c0931d4cd90134a 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -4,7 +4,7 @@ This tutorial will walk you through setting up a wiki with ikiwiki.
 
 ## Install ikiwiki
 
 
 ## Install ikiwiki
 

-If you're using Debian or Ubuntu, ikiwiki is an `apt-get install ikiwiki` away.
+If you're using Debian or Ubuntu, ikiwiki is an <code><a href="http://www.debian.org/doc/manuals/debian-reference/ch02.en.html#_basic_package_management_operations">apt-get</a> install ikiwiki</code> away.

 If you're not, see the [[download]] and [[install]] pages.
 
 ## Create your wiki
 If you're not, see the [[download]] and [[install]] pages.
 
 ## Create your wiki


@@ -16,11 +16,13 @@ For more control, advanced users may prefer to set up a wiki
 [[by_hand|byhand]].
 """]]
 
 [[by_hand|byhand]].
 """]]
 

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

 
 Or, set up a blog with ikiwiki, run this command instead.
 
 
 Or, set up a blog with ikiwiki, run this command instead.
 

-       % ikiwiki -setup /etc/ikiwiki/auto-blog.setup
+       % ikiwiki --setup /etc/ikiwiki/auto-blog.setup
+
+`librpc-xml-perl` and `python-docutils` dependencies are needed.

 
 Either way, it will ask you a couple of questions.
 
 
 Either way, it will ask you a couple of questions.
 


@@ -37,7 +39,7 @@ Then, wait for it to tell you an url for your new site..
                destdir:     ~/public_html/foo
                repository:  ~/foo.git
        To modify settings, edit ~/foo.setup and then run:
                destdir:     ~/public_html/foo
                repository:  ~/foo.git
        To modify settings, edit ~/foo.setup and then run:

-               ikiwiki -setup ~/foo.setup
+               ikiwiki --setup ~/foo.setup

 
 Done! 
 
 
 Done! 
 


@@ -47,7 +49,7 @@ Now you can go to the url it told you, and edit pages in your new wiki
 using the web interface.
 
 (If the web interface doesn't seem to allow editing or login, you may
 using the web interface.
 
 (If the web interface doesn't seem to allow editing or login, you may

-need to configure [[configure_the_web_server|tips/dot_cgi]].)
+need to [[configure_the_web_server|tips/dot_cgi]].)

 
 ## Checkout and edit wiki source
 
 
 ## Checkout and edit wiki source
 


@@ -65,8 +67,10 @@ source. (Remember to replace "foo" with the real directory name.)
 
        git clone foo.git foo.src
        svn checkout file://`pwd`/foo.svn/trunk foo.src
 
        git clone foo.git foo.src
        svn checkout file://`pwd`/foo.svn/trunk foo.src

+       cvs -d `pwd`/foo get -P ikiwiki

        bzr clone foo foo.src
        hg clone foo foo.src
        bzr clone foo foo.src
        hg clone foo foo.src

+       darcs get foo.darcs foo.src

        # TODO monotone, tla
 
 Now to edit pages by hand, go into the directory you checked out (ie,
        # TODO monotone, tla
 
 Now to edit pages by hand, go into the directory you checked out (ie,


@@ -88,7 +92,7 @@ These range from changing the wiki's name, to enabling [[plugins]],
 to banning users and locking pages.
 
 If you log in as the admin user you configured earlier, and go to
 to banning users and locking pages.
 
 If you log in as the admin user you configured earlier, and go to

-your Preferences page, you can click on "Wiki Setup" to customize many
+your Preferences page, you can click on "Setup" to customize many

 wiki settings and plugins.
 
 Some settings cannot be configured on the web, for security reasons or
 wiki settings and plugins.
 
 Some settings cannot be configured on the web, for security reasons or


@@ -99,7 +103,13 @@ and gives a brief description of each.
 
 After making changes to this file, you need to tell ikiwiki to use it:
 
 
 After making changes to this file, you need to tell ikiwiki to use it:
 

-       % ikiwiki -setup foo.setup
+       % ikiwiki --setup foo.setup
+
+Alternatively, you can ask ikiwiki to change settings in the file for you:
+
+       % ikiwiki --changesetup foo.setup --plugin goodstuff
+
+See [[usage]] for more options.

 
 ## Customizing file locations
 
 
 ## Customizing file locations
 


@@ -122,11 +132,11 @@ old location won't work, and the easiest way to deal with this is to delete
 them and re-checkout from the new repository location.
    
        % rm -rf foo
 them and re-checkout from the new repository location.
    
        % rm -rf foo

-       % git clone /src/git/foo.git
+       % git clone /srv/git/foo.git

 
 Finally, edit the setup file. Modify the settings for `srcdir`, `destdir`,
 `url`, `cgiurl`, `cgi_wrapper`, `git_wrapper`, etc to reflect where
 
 Finally, edit the setup file. Modify the settings for `srcdir`, `destdir`,
 `url`, `cgiurl`, `cgi_wrapper`, `git_wrapper`, etc to reflect where

-you moved things. Remember to run `ikiwiki -setup` after editing the
+you moved things. Remember to run `ikiwiki --setup` after editing the

 setup file.
 
 ## Enjoy your new wiki!
 setup file.
 
 ## Enjoy your new wiki!