Merge branch 'master' into po

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

diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 55ff17e94a7e8b0912c3de1a34869e02fa68b51e..e2fe85ff60d8b5a91901ef9ec235e5b8e09d4b69 100644 (file)
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -106,11 +106,11 @@ These options configure the wiki. Note that [[plugins]] can add additional
 configuration options of their own. All of these options and more besides can
 also be configured using a setup file.
 
-* --wikiname
+* --wikiname name
 
   The name of the wiki, default is "wiki".
 
-* --templatedir
+* --templatedir dir
 
   Specify the directory that the page [[templates|wikitemplates]] are stored in.
   Default is `/usr/share/ikiwiki/templates`, or another location as configured at
@@ -122,7 +122,7 @@ also be configured using a setup file.
   ikiwiki. Old versions of templates do not always work with new ikiwiki
   versions.
 
-* --underlaydir
+* --underlaydir dir
 
   Specify the directory that is used to underlay the source directory.
   Source files will be taken from here unless overridden by a file in the