web commit by bartuer: add a question about restructuredtext

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

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 864dc928ff2dd01ebf357979a3431e67a3619842..885f77813b8865ab8b32fed7c1cfe306639044a2 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -40,22 +40,24 @@ 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]]",
+
+       # Bazaar stuff.
+       #rcs => "bzr",
+       #historyurl => "", 
+       #diffurl => "http://example.com/revision?start_revid=[[r2]]#[[file]]-s", # using loggerhead

 
        # Monotone stuff
        #rcs => "monotone",
        #mtnkey => "web\@machine.company.com",
 
        # Monotone stuff
        #rcs => "monotone",
        #mtnkey => "web\@machine.company.com",

-       # Monotone options
-       #mtnsync => 0,                              # set this if you want the wiki to sync on update and commit
-       #mtnrootdir => "path/to/root/of/workspace", # The path to your workspace (defaults to the srcdir itself)
-                                                   # e.g. use if your srcdir is a subdirectory of the workspace
-       #mtnbinpath => "path/to/montone/binary",    # by default we just use "mtn" and assume it is in your path.
-       #mtnmergerc => "path/to/mergerc",           # this is a monotone lua hook file used by ikiwiki for
-                                                   # inserting conflict markers.  By default we 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.
+       #historyurl => "http://viewmtn.example.com/branch/head/filechanges/com.example.branch/[[file]]",
+       #diffurl => "http://viewmtn.example.com/revision/diff/[[r1]]/with/[[r2]]/[[file]]",
+       # 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",

 
        wrappers => [
                #{
 
        wrappers => [
                #{


@@ -71,8 +73,6 @@ use IkiWiki::Setup::Standard {
                #       # what you want.
                #       wrapper => "/svn/wikirepo/hooks/post-commit",
                #       wrappermode => "04755",
                #       # what you want.
                #       wrapper => "/svn/wikirepo/hooks/post-commit",
                #       wrappermode => "04755",

-               #       # Enable mail notifications of commits.
-               #       notify => 1,

                #       # Log to syslog since svn post-commit hooks
                #       # hide output and errors.
                #       syslog => 1,
                #       # Log to syslog since svn post-commit hooks
                #       # hide output and errors.
                #       syslog => 1,


@@ -83,23 +83,29 @@ 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",
-               #       # Enable mail notifications of commits.
-               #       notify => 1,
+               #       wrappermode => "06755",
+               #},
+               #{
+               #       # The monotone netsync hook.
+               #       wrapper => "path/to/root/of/workspace/_MTN/ikiwiki-netsync-hook",
+               #       wrappermode => "06755",

                #},
        ],
 
                #},
        ],
 

-       # Generate rss feeds for blogs?
-       rss => 1,
-       # Generate atom feeds for blogs?
-       atom => 1,
+       # Default to generating rss feeds for pages with feeds?
+       #rss => 1,
+       # Default to generating atom feeds for pages with feeds?
+       #atom => 1,
+       # Allow generating feeds even if not generated by default?
+       #allowrss => 1,
+       #allowatom => 1,

        # Urls to ping with XML-RPC when rss feeds are updated
        #pingurl => [qw{http://rpc.technorati.com/rpc/ping}],
        # Include discussion links on all pages?
        discussion => 1,
        # To exclude files matching a regexp from processing. This adds to
        # the default exclude list.
        # Urls to ping with XML-RPC when rss feeds are updated
        #pingurl => [qw{http://rpc.technorati.com/rpc/ping}],
        # Include discussion links on all pages?
        discussion => 1,
        # To exclude files matching a regexp from processing. This adds to
        # the default exclude list.

-       #exclude => qr/*\.wav/,
+       #exclude => qr/\.wav$/,

        # To change the extension used for generated html files.
        #htmlext => 'htm',
        # Time format (for strftime)
        # To change the extension used for generated html files.
        #htmlext => 'htm',
        # Time format (for strftime)


@@ -117,13 +123,23 @@ 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,
+       # Default settings for the recentchanges page.
+       #recentchangespage => "recentchanges",
+       #recentchangesnum => 100,
+       # Use new '!'-prefixed preprocessor directive syntax
+       #prefix_directives => 0,
+       # Attempt to make hardlinks to source files instead of copying them.
+       # Useful if the wiki contains large media files.
+       #hardlink => 1,

 
        # 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