X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2fb92c0dd491715501d7c2ef62d624c63253830d..5b5fb8e877b632802b9131221ee11e2be8c28419:/doc/ikiwiki.setup?ds=sidebyside

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index f61c582d8..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 => [
 		#{
@@ -59,6 +74,9 @@ use IkiWiki::Setup::Standard {
 		#	wrappermode => "04755",
 		#	# Enable mail notifications of commits.
 		#	notify => 1,
+		#	# Log to syslog since svn post-commit hooks
+		#	# hide output and errors.
+		#	syslog => 1,
 		#},
 		#{
 		#	# The git post-update wrapper.
@@ -83,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.
@@ -90,18 +110,22 @@ use IkiWiki::Setup::Standard {
 	# Only send cookies over SSL connections.
 	#sslcookie => 1,
 	# Logging settings:
-	verbose => 0,
+	#verbose => 1,
 	syslog => 0,
 	# To link to user pages in a subdirectory of the wiki.
 	#userdir => "users",
-	# To create output files named page/index.html rather than page.html.
-	#usedirs => 1,
+	# To create output files named page.html rather than page/index.html.
+	#usedirs => 0,
+	# Simple spam prevention: require an account-creation password.
+	#account_creation_password => "example",
 
 	# To add plugins, list them here.
-	#add_plugins => [qw{goodstuff openid search wikitext camelcase
+	#add_plugins => [qw{goodstuff search wikitext camelcase
 	#                   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}],
+	#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.