web commit by http://adam.shand.net/

[ikiwiki.git] / doc / usage.mdwn

diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 3075cb1075f0b2c6e18a702d048e7ba72b6dd2c2..136e969c2752d145b29491d80668141d858a566a 100644 (file)
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -11,7 +11,7 @@ ikiwiki --setup configfile
 # DESCRIPTION
 
 `ikiwiki` is a wiki compiler. It builds static HTML pages for a wiki, from
-`source` in the [[Markdown]] language (or others), and writes it out to
+`source` in the [[ikiwiki/Markdown]] language (or others), and writes it out to
 `destination`.
 
 Note that most options can be shortened to single letters, and boolean
@@ -125,6 +125,14 @@ configuration options of their own.
 
   Specify a mode to chmod the wrapper to after creating it.
 
+* --wrappergroup group
+
+  Specify what unix group the wrapper should be owned by. This can be
+  useful if the wrapper needs to be owned by a group other than the default.
+  For example, if a project has a repository with multiple committers with
+  access controlled by a group, it makes sense for the ikiwiki wrappers
+  to run setgid to that group.
+
 * --notify, --no-notify
 
   Enable email notification of commits. This should be used when running
@@ -158,12 +166,12 @@ configuration options of their own.
 * --rss, --norss
 
   If rss is set, ikiwiki will generate RSS feeds for pages that inline
-  a [[blog]].
+  a [[ikiwiki/blog]].
 
 * --atom, --noatom
 
   If atom is set, ikiwiki will generate Atom feeds for pages that inline
-  a [[blog]].
+  a [[ikiwiki/blog]].
 
 * --pingurl URL
 
@@ -207,9 +215,12 @@ configuration options of their own.
 
 * --adminuser name
 
-  Specifies a username of a user who has the powers of a wiki admin.
-  Currently allows locking of any page; other powers may be added later.
-  May be specified multiple times for multiple admins.
+  Specifies a username of a user (or, if openid is enabled, an openid) 
+  who has the powers of a wiki admin. Currently allows locking of any page,
+  and banning of users; other powers may be added later. May be specified
+  multiple times for multiple admins.
+
+  For an openid user specify the full URL of the login, including "http://".
 
 * --plugin name
 
@@ -292,9 +303,16 @@ configuration options of their own.
   using command-line switches, you will rarely need to use this, but it can be
   useful for the odd option that lacks a command-line switch.
 
+# ENVIRONMENT
+
+* CC
+
+  This controls what C compiler is used to build wrappers. Default is 'cc'.
+
 # SEE ALSO
 
 * [[ikiwiki-mass-rebuild]](8)
+* [[ikiwiki-update-wikilist]](1)
 
 # AUTHOR