* Ensure that web edited pages always end in a newline.

[git.ikiwiki.info.git] / doc / ikiwiki.setup

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 9d2859a86c325d849a287e911d30d7b4ce410316..1377315aeba52bc1bc790bb11e8fb379418a3b27 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -40,8 +40,23 @@ use IkiWiki::Setup::Standard {
 
        # Mercurial stuff.
        #rcs => "mercurial",
-       #historyurl => "http://localhost:8000/", # hg serve'd local repository
-       #diffurl => "http://localhost:8000/?fd=[[changeset]];file=[[file]]",
+       #historyurl => "http://localhost:8000/log/tip/[[file]]", # hg serve'd local repository
+       #diffurl => "http://localhost:8000/?fd=[[r2]];file=[[file]]",
+
+       # Monotone stuff
+       #rcs => "monotone",
+       #mtnkey => "web\@machine.company.com",
+       # Set if you want the wiki to sync on update and commit.
+       #mtnsync => 0,
+       # The path to your workspace (defaults to the srcdir itself)
+       # e.g. use if your srcdir is a subdirectory of the workspace.
+       #mtnrootdir => "path/to/root/of/workspace",
+       # This is a monotone lua hook file used by ikiwiki for
+       # inserting conflict markers. By default it will use
+       # mtnrootdir/_MTN/mergerc. This hook will be populated with
+       # default code the first time you use ikiwiki.  You can
+       # change it to alter how conflict markers are inserted.
+       #mtnmergerc => "path/to/mergerc",
 
        wrappers => [
                #{
@@ -69,7 +84,7 @@ use IkiWiki::Setup::Standard {
                #       # post-update hook script, which may not be
                #       # what you want.
                #       wrapper => "/git/wiki.git/hooks/post-update",
-               #       wrappermode => "04755",
+               #       wrappermode => "06755",
                #       # Enable mail notifications of commits.
                #       notify => 1,
                #},
@@ -87,7 +102,7 @@ use IkiWiki::Setup::Standard {
        # the default exclude list.
        #exclude => qr/*\.wav/,
        # To change the extension used for generated html files.
-       #htmlext => '.htm',
+       #htmlext => 'htm',
        # Time format (for strftime)
        #timeformat => '%c',
        # Locale to use. Must be a UTF-8 locale.
@@ -103,13 +118,15 @@ use IkiWiki::Setup::Standard {
        #usedirs => 0,
        # Simple spam prevention: require an account-creation password.
        #account_creation_password => "example",
+       # Uncomment to force ikiwiki to run with a particular umask.
+       #umask => 022
 
        # To add plugins, list them here.
        #add_plugins => [qw{goodstuff search wikitext camelcase
        #                   htmltidy fortune sidebar map rst anonok}],
        # If you want to disable any of the default plugins, list them here.
        #disable_plugins => [qw{inline htmlscrubber passwordauth openid}],
-       # To add a directory to the perl searh path, use this.
+       # To add a directory to the perl search path, use this.
        #libdir => "/home/me/.ikiwiki/",
 
        # For use with the tag plugin, make all tags be located under a