web commit from 63.252.84.66: poll vote (It's fast enough)

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

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index d498e8dfa158a15419181e686fdba25be8acd5ab..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]]",
 
        #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.
        wrappers => [
                #{
                #       # The cgi wrapper.


@@ -86,6 +101,8 @@ use IkiWiki::Setup::Standard {
        # To exclude files matching a regexp from processing. This adds to
        # the default exclude list.
        #exclude => qr/*\.wav/,
        # To exclude files matching a regexp from processing. This adds to
        # the default exclude list.
        #exclude => qr/*\.wav/,

+       # To change the extension used for generated html files.
+       #htmlext => 'htm',

        # Time format (for strftime)
        #timeformat => '%c',
        # Locale to use. Must be a UTF-8 locale.
        # Time format (for strftime)
        #timeformat => '%c',
        # Locale to use. Must be a UTF-8 locale.


@@ -93,18 +110,22 @@ use IkiWiki::Setup::Standard {
        # Only send cookies over SSL connections.
        #sslcookie => 1,
        # Logging settings:
        # Only send cookies over SSL connections.
        #sslcookie => 1,
        # Logging settings:

-       verbose => 0,
+       #verbose => 1,

        syslog => 0,
        # To link to user pages in a subdirectory of the wiki.
        #userdir => "users",
        # To create output files named page.html rather than page/index.html.
        #usedirs => 0,
        syslog => 0,
        # To link to user pages in a subdirectory of the wiki.
        #userdir => "users",
        # To create output files named page.html rather than page/index.html.
        #usedirs => 0,

+       # Simple spam prevention: require an account-creation password.
+       #account_creation_password => "example",

 
        # 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 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.
+       #libdir => "/home/me/.ikiwiki/",

 
        # For use with the tag plugin, make all tags be located under a
        # base page.
 
        # For use with the tag plugin, make all tags be located under a
        # base page.