(no commit message)

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

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index ac491baae78f9422fc30fab1324cc0a315fb0f2b..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! 
 


@@ -101,11 +103,11 @@ 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:
 
 
 Alternatively, you can ask ikiwiki to change settings in the file for you:
 

-       % ikiwiki -changesetup foo.setup -plugin goodstuff
+       % ikiwiki --changesetup foo.setup --plugin goodstuff

 
 See [[usage]] for more options.
 
 
 See [[usage]] for more options.
 


@@ -130,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!