web commit by ali: Give in and use html which I can remember!

[ikiwiki.git] / doc / ikiwiki.setup

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 9d2859a86c325d849a287e911d30d7b4ce410316..897e8bc61771af0a7bc062e18792fd5bf19e519e 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -43,6 +43,21 @@ use IkiWiki::Setup::Standard {
        #historyurl => "http://localhost:8000/", # hg serve'd local repository
        #diffurl => "http://localhost:8000/?fd=[[changeset]];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 => [
                #{
                #       # The cgi wrapper.
@@ -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.