X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9232e5df3b0f41dbaabe926a8b5b393be6ddf9cd..88581b8e72499fc4b6289f9299adc7a832e3e307:/doc/ikiwiki.setup

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 12df4507f..3a0658e9d 100644
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -41,7 +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",
+	# 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 => [
 		#{
@@ -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 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.
@@ -107,6 +124,8 @@ use IkiWiki::Setup::Standard {
 	#                   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.