X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1e5cd11635ef45e8223f56b952c8636d993e5908..71ccaf07510319a1366cd459295d63a6320c50b0:/doc/ikiwiki.setup

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 9d2859a86..0094bcb2a 100644
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -23,7 +23,6 @@ use IkiWiki::Setup::Standard {
 	#rcs => "svn",
 	#historyurl => "http://svn.example.org/trunk/[[file]]",
 	#diffurl => "http://svn.example.org/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]",
-	#svnrepo => "/svn/wiki",
 	#svnpath => "trunk",
 
 	# Git stuff.
@@ -40,8 +39,30 @@ 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]]",
+	#historyurl => "http://localhost:8000/log/tip/[[file]]", # hg serve'd local repository
+	#diffurl => "http://localhost:8000/?fd=[[r2]];file=[[file]]",
+
+	# Bazaar stuff.
+	#rcs => "bzr",
+	#historyurl => "", 
+	#diffurl => "http://example.com/revision?start_revid=[[r2]]#[[file]]-s", # using loggerhead
+
+	# Monotone stuff
+	#rcs => "monotone",
+	#mtnkey => "web\@machine.company.com",
+	#historyurl => "http://viewmtn.example.com/",
+	#diffurl => "http://viewmtn.example.com/revision/diff/[[r1]]/with/[[r2]]/[[file]]",
+	# 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 => [
 		#{
@@ -57,8 +78,6 @@ use IkiWiki::Setup::Standard {
 		#	# what you want.
 		#	wrapper => "/svn/wikirepo/hooks/post-commit",
 		#	wrappermode => "04755",
-		#	# Enable mail notifications of commits.
-		#	notify => 1,
 		#	# Log to syslog since svn post-commit hooks
 		#	# hide output and errors.
 		#	syslog => 1,
@@ -69,16 +88,17 @@ use IkiWiki::Setup::Standard {
 		#	# post-update hook script, which may not be
 		#	# what you want.
 		#	wrapper => "/git/wiki.git/hooks/post-update",
-		#	wrappermode => "04755",
-		#	# Enable mail notifications of commits.
-		#	notify => 1,
+		#	wrappermode => "06755",
 		#},
 	],
 
-	# Generate rss feeds for blogs?
-	rss => 1,
-	# Generate atom feeds for blogs?
-	atom => 1,
+	# Default to generating rss feeds for blogs?
+	#rss => 1,
+	# Default to generating atom feeds for blogs?
+	#atom => 1,
+	# Allow generating feeds even if not generated by default?
+	#allowrss => 1,
+	#allowatom => 1,
 	# Urls to ping with XML-RPC when rss feeds are updated
 	#pingurl => [qw{http://rpc.technorati.com/rpc/ping}],
 	# Include discussion links on all pages?
@@ -87,7 +107,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.
@@ -103,13 +123,20 @@ use IkiWiki::Setup::Standard {
 	#usedirs => 0,
 	# Simple spam prevention: require an account-creation password.
 	#account_creation_password => "example",
+	# Uncomment to force ikiwiki to run with a particular umask.
+	#umask => 022,
+	# Default settings for the recentchanges page.
+	#recentchangespage => "recentchanges",
+	#recentchangesnum => 100,
+	# Use new '!'-prefixed preprocessor directive syntax
+	#prefix_directives => 0,
 
 	# To add plugins, list them here.
 	#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 openid}],
-	# To add a directory to the perl searh path, use this.
+	# To add a directory to the perl search path, use this.
 	#libdir => "/home/me/.ikiwiki/",
 
 	# For use with the tag plugin, make all tags be located under a