* tag: Add taglink preprocessor directive, supporting visible tag links.

[ikiwiki.git] / doc / ikiwiki.setup

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 864dc928ff2dd01ebf357979a3431e67a3619842..3a0658e9d29824c06b2b76ef15dd9b288932004a 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -41,21 +41,22 @@ 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]]",
+       #diffurl => "http://localhost:8000/?fd=[[r2]];file=[[file]]",
 
        # 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.
+       # 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 => [
                #{