Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

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

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 897e8bc61771af0a7bc062e18792fd5bf19e519e..1377315aeba52bc1bc790bb11e8fb379418a3b27 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -40,8 +40,8 @@ use IkiWiki::Setup::Standard {
 
        # Mercurial stuff.
        #rcs => "mercurial",
 
        # 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",
 
        # Monotone stuff
        #rcs => "monotone",


@@ -84,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",
                #       # 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,
                #},
                #       # Enable mail notifications of commits.
                #       notify => 1,
                #},


@@ -118,13 +118,15 @@ use IkiWiki::Setup::Standard {
        #usedirs => 0,
        # Simple spam prevention: require an account-creation password.
        #account_creation_password => "example",
        #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 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
        #libdir => "/home/me/.ikiwiki/",
 
        # For use with the tag plugin, make all tags be located under a