X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e62664cddb1ab25b814801e2b75a8908062846f0..b1fecf16daa5e6652b603e918283f12d8584e869:/doc/ikiwiki.setup

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index a9a9b9f19..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.