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

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 7f0975f5d..a25d9f50e 100644
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -29,6 +29,8 @@ use IkiWiki::Setup::Standard {
 	#rcs => "git",
 	#historyurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]]",
 	#diffurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
+	#gitorigin_branch => "origin",
+	#gitmaster_branch => "master",
 
 	# Tla stuff.
 	#rcs => "tla"
@@ -69,8 +71,6 @@ use IkiWiki::Setup::Standard {
 		#},
 	],
 	
-	# Can anonymous web users edit pages?
-	#anonok => 1,
 	# Generate rss feeds for blogs?
 	rss => 1,
 	# Generate atom feeds for blogs?
@@ -81,7 +81,7 @@ use IkiWiki::Setup::Standard {
 	discussion => 1,
 	# To exclude files matching a regexp from processing. This adds to
 	# the default exclude list.
-	#exclude => qr/\*.wav/,
+	#exclude => qr/*\.wav/,
 	# Time format (for strftime)
 	#timeformat => '%c',
 	# Locale to use. Must be a UTF-8 locale.
@@ -91,16 +91,18 @@ use IkiWiki::Setup::Standard {
 	# Logging settings:
 	verbose => 0,
 	syslog => 0,
+	# To link to user pages in a subdirectory of the wiki.
+	#userdir => "users",
 	
 	# To add plugins, list them here.
-	#add_plugins => [qw{nicebundle openid search wikitext camelcase
-	#                   htmltidy fortune sidebar map rst}],
+	#add_plugins => [qw{goodstuff openid 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}],
 
 	# For use with the tag plugin, make all tags be located under a
 	# base page.
-	#tagbase => "tag".
+	#tagbase => "tag",
 	
 	# For use with the search plugin if your estseek.cgi is located 
 	# somewhere else.
@@ -109,4 +111,10 @@ use IkiWiki::Setup::Standard {
 	# For use with the openid plugin, to give an url to a page users
 	# can use to signup for an OpenID.
 	#openidsignup => "http://myopenid.com/",
+	
+	# For use with the mirrorlist plugin, a list of mirrors.
+	#mirrorlist => {
+	#	mirror1 => "http://hostname1",
+	#	mirror2 => "http://hostname2/mirror",
+	#},
 }