Merge commit 'upstream/master'

[git.ikiwiki.info.git] / doc / ikiwiki-mass-rebuild.mdwn

diff --git a/doc/ikiwiki-mass-rebuild.mdwn b/doc/ikiwiki-mass-rebuild.mdwn
index 5c2cf40e57af4c93be829e361434c65c3ede5dd8..5f144b49bcd68a7978a711b19a7145c0346d1a23 100644 (file)
--- a/doc/ikiwiki-mass-rebuild.mdwn
+++ b/doc/ikiwiki-mass-rebuild.mdwn
@@ -9,13 +9,22 @@ ikiwiki-mass-rebuild
 # DESCRIPTION
 
 `ikiwiki-mass-rebuild` can be used to force a rebuild of all the wikis
 # DESCRIPTION
 
 `ikiwiki-mass-rebuild` can be used to force a rebuild of all the wikis

-on a system. You will need to list the wikis it shuld build in the file
-/etc/ikiwiki/wikilist, which has the format:
+on a system. You will need to list the setup files for the wikis it should
+build in the file `/etc/ikiwiki/wikilist`, which has the format:

 
 

-user /path/to/wiki
+user /path/to/ikiwiki.setup
+
+It's also possible to let a user list setup files in `~user/.ikiwiki/wikilist`
+in their home directory. To do so, list only the user's name, without a
+setup file. The format of `~/.ikiwiki/wikilist` is the same as 
+`/etc/ikiwiki/wikilist`.
+
+# OPTIONS
+
+All options are passed on to ikiwiki.

 
 # AUTHOR
 
 
 # AUTHOR
 

-Joey Hess <joey@kitenet.net>
+Joey Hess <joey@ikiwiki.info>

 
 Warning: this page is automatically made into ikiwiki-mass-rebuild's man page, edit with care
 
 Warning: this page is automatically made into ikiwiki-mass-rebuild's man page, edit with care