add news item for ikiwiki 1.4

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

diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index c4d1f5818627b9327e8c583a416a182fec079748..c0fab5232e5d5a0ec529d1f5db1c08e1f0c8a483 100644 (file)
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -90,17 +90,18 @@ These options configure the wiki.
   Enable email notification of commits. This should be used when running
   ikiwiki as a [[Subversion]] [[post-commit]] hook.
 
   Enable email notification of commits. This should be used when running
   ikiwiki as a [[Subversion]] [[post-commit]] hook.
 

-* --svn, --nosvn
+* --rcs=svn, --no-rcs

 
 

-  Enable or disable use of [[subversion]]. If subversion is enabled, the
-  `source` directory is assumed to be a working copy, and is automatically
-  updated before building the wiki. 
+  Enable or disable use of a revision control system.

 
 

-  In [[CGI]] mode, with subversion enabled pages edited via the web will be
-  committed to subversion. Also, the [[RecentChanges]] link will be placed
+  If you use svn ([[Subversion]]), the `source` directory is assumed to be
+  a working copy, and is automatically updated before building the wiki.
+
+  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.
 
   on pages.
 

-  Subversion is enabled by default.
+  svn is enabled by default.

 
 * --svnrepo /svn/wiki
 
 
 * --svnrepo /svn/wiki
 


@@ -161,31 +162,32 @@ These options configure the wiki.
   Currently allows locking of any page, other powers may be added later.
   May be specified multiple times for multiple admins.
 
   Currently allows locking of any page, other powers may be added later.
   May be specified multiple times for multiple admins.
 

-* --sanitize
-
-  Enable [[HtmlSanitization]] of wiki content. On by default, disable with
-  --no-sanitize.
-

 * --plugin name
 
   Enables the use of the specified plugin in the wiki. See [[plugins]] for
   details. Note that plugin names are case sensative.
 
 * --plugin name
 
   Enables the use of the specified plugin in the wiki. See [[plugins]] for
   details. Note that plugin names are case sensative.
 

-* --hyperestraier
+* --disable-plugin name
+
+  Disables use of a plugin. For example "--disable-plugin htmlscrubber"
+  to do away with html sanitization.
+
+* --discussion, --no-discussion

 
 

-  Enables use of the [[HyperEstraier]] search engine for full test page
-  searches.
+  Enables or disables "Discussion" links from being added to the header of
+  every page. The links are enabled by default.

 
 * --verbose
 
   Be vebose about what is being done.
 
 
 * --verbose
 
   Be vebose about what is being done.
 

-* --fixctime
+* --getctime

 
 

-  Pull last changed time for all pages out of the revision control system.
-  This rarely used option provides a way to get the real creation times of
-  items in weblogs, for example when building a wiki from a new subversion
-  checkout. It is unoptimised and quite slow.
+  Pull last changed time for each new page out of the revision control
+  system. This rarely used option provides a way to get the real creation
+  times of items in weblogs, for example when building a wiki from a new
+  subversion checkout. It is unoptimised and quite slow. It is best used
+  with --rebuild, to force ikiwiki to get the ctime for all pages.

 
 # AUTHOR
 
 
 # AUTHOR