X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4ad7c9d6257ca106b2949d22f6300823190991a0..ace6a60b1b4f3f4faaa5f50140e95adf796b5ec5:/doc/usage.mdwn?ds=sidebyside

diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 4456e8c1c..485198d61 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -56,10 +56,12 @@ These options control the mode that ikiwiki is operating in.
   In setup mode, ikiwiki reads the config file, which is really a perl
   program that can call ikiwiki internal functions.
 
+  [[ikiwiki.setup]] is an example of such a config file.
+
   The default action when --setup is specified is to automatically generate
   wrappers for a wiki based on data in a config file, and rebuild the wiki.
-
-  [[ikiwiki.setup]] is an example of such a config file.
+  If you only want to build any changed pages, you can use --refresh with
+  --setup.
 
 * --wrappers
 
@@ -75,6 +77,15 @@ These options control the mode that ikiwiki is operating in.
   along with this one. --rebuild will also force feeds to be polled even if
   they were polled recently.
 
+* --render file
+
+  Renders a single file, outputting the resulting html. Does not save state,
+  so this cannot be used for building whole wikis, but it is useful for
+  previewing an edited file at the command line. Generally used in conjunction
+  with --setup to load in a wiki's setup:
+
+	ikiwiki --setup ~/ikiwiki.setup --render foo.mdwn
+
 * --version
 
   Print ikiwiki version number.
@@ -90,9 +101,10 @@ configuration options of their own.
 
 * --templatedir
 
-  Specify the directory that the page [[templates]] are stored in.
-  Default is `/usr/share/ikiwiki/templates`, or another location as
-  configured at build time.
+  Specify the directory that the page [[templates]] are stored in. Default
+  is `/usr/share/ikiwiki/templates`, or another location as configured at
+  build time. If the templatedir is changed, missing templates will still
+  be searched for in the default location as a fallback.
 
 * --underlaydir
 
@@ -120,11 +132,16 @@ configuration options of their own.
   If you use git, the `source` directory is assumed to be a clone of the
   [[git]] repository.
 
+  If you use tla, the `source` directory is assumed to be a tla import.
+
+  If you use mercurial, the `source` directory is assumed to be the
+  [[mercurial]] repository.
+
   In [[CGI]] mode, with a revision control system enabled pages edited via
   the web will be committed. Also, the [[RecentChanges]] link will be placed
   on pages.
 
-  svn is enabled by default.
+  No revision control is enabled by default.
 
 * --svnrepo /svn/wiki
 
@@ -137,15 +154,14 @@ configuration options of their own.
   This defaults to trunk; change it if your wiki is at some other location
   inside the repository.
 
-* --anonok, --noanonok
+* --rss, --norss
 
-  If anonok is set, it will allow anonymous web users, who have not signed in, to make changes to the wiki.
+  If rss is set, ikiwiki will generate RSS feeds for pages that inline
+  a [[blog]].
 
-  By default, anonymous users cannot edit the wiki.
+* --atom, --noatom
 
-* --rss, --norss
-
-  If rss is set, ikiwiki will generate rss feeds for pages that inline
+  If atom is set, ikiwiki will generate Arom feeds for pages that inline
   a [[blog]].
 
 * --pingurl url
@@ -170,7 +186,7 @@ configuration options of their own.
 
   Specifies the url to link to for page history browsing. In the url,
   "\[[file]]" is replaced with the file to browse. It's common to use
-  [[ViewCVS]] for this.
+  [[ViewVC]] for this.
 
 * --adminemail you@yourhost
 
@@ -181,7 +197,7 @@ configuration options of their own.
   Specifies the url to link to for a diff of changes to a page. In the url,
   "\[[file]]" is replaced with the file to browse, "\[[r1]]" is the old
   revision of the page, and "\[[r2]]" is the new revision. It's common to use
-  [[ViewCVS]] for this.
+  [[ViewVC]] for this.
 
 * --exclude regexp
 
@@ -209,6 +225,12 @@ configuration options of their own.
   Enables or disables "Discussion" links from being added to the header of
   every page. The links are enabled by default.
 
+* --userdir subdir
+
+  Optionally, allows links to users of the wiki to link to pages inside a
+  subdirectory of the wiki. The default is to link to pages in the toplevel
+  directory of the wiki.
+
 * --timeformat format
 
   Specify how to display the time or date. The format string is passed to the
@@ -216,7 +238,7 @@ configuration options of their own.
 
 * --verbose, --no-verbose
 
-  Be vebose about what is being done.
+  Be verbose about what is being done.
 
 * --syslog, --no-syslog