X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/98d71ccef586e30c96310d506f0df7fcf46a55de..4560013bf90e59450da77f019ff03a9e72a06c3e:/doc/ikiwiki.setup?ds=inline

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 69162c0e4..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?
@@ -96,13 +96,13 @@ use IkiWiki::Setup::Standard {
 	
 	# To add plugins, list them here.
 	#add_plugins => [qw{goodstuff openid search wikitext camelcase
-	#                   htmltidy fortune sidebar map rst}],
+	#                   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.