X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1612dce6bbb050eacf6843b972ffaf9816d724be..adcd50f2d4bc4c67efbea781847bcc8a551e1ce4:/doc/ikiwiki.setup

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index a772ca60b..897e8bc61 100644
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -43,6 +43,21 @@ use IkiWiki::Setup::Standard {
 	#historyurl => "http://localhost:8000/", # hg serve'd local repository
 	#diffurl => "http://localhost:8000/?fd=[[changeset]];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 => [
 		#{
 		#	# The cgi wrapper.
@@ -87,7 +102,7 @@ use IkiWiki::Setup::Standard {
 	# the default exclude list.
 	#exclude => qr/*\.wav/,
 	# To change the extension used for generated html files.
-	#htmlext => '.htm',
+	#htmlext => 'htm',
 	# Time format (for strftime)
 	#timeformat => '%c',
 	# Locale to use. Must be a UTF-8 locale.
@@ -109,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.