X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/50e1b43408e85fd2350b9df50e4ceb0c6a495a4f..c5343fb5bc8963131e56856a6191719bc0c3717a:/doc/ikiwiki.setup?ds=sidebyside

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 864dc928f..3a0658e9d 100644
--- 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 => [
 		#{