diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-03-27 15:09:41 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-03-27 15:09:41 -0400 |
| commit | 825e2b1378b1def4980e36642ed84999599eb017 (patch) | |
| tree | 8c5225715c9cf7a3405dbc679f124f74ca9983e7 /doc/usage.mdwn | |
| parent | f4a1732b0e65ea4459098e4e852dff10a5af9320 (diff) | |
| parent | c8237b4351f6023b3d3a661df2568c6d7488b8cf (diff) | |
Merge branch 'master' into po
Conflicts:
debian/control
Diffstat (limited to 'doc/usage.mdwn')
| -rw-r--r-- | doc/usage.mdwn | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/usage.mdwn b/doc/usage.mdwn index 55ff17e94..e2fe85ff6 100644 --- 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 |