X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/72dbbe3a2cc3550a2aaaf226fd561c0d5064b5b4..d369d752f9c6e6d582a6fc2661764171625bea7d:/doc/ikiwiki.setup?ds=sidebyside

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 910b2b527..d54527eca 100644
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # Configuration file for ikiwiki.
-# Passing this to ikiwiki --setup will make ikiwiki generate wrappers and 
+# Passing this to ikiwiki --setup will make ikiwiki generate wrappers and
 # build the wiki.
 #
 # Remember to re-run ikiwiki --setup any time you edit this file.
@@ -9,15 +9,16 @@ use IkiWiki::Setup::Standard {
 	wikiname => "MyWiki",
 	#adminuser => ["yourname", ],
 	adminemail => 'me@example.org',
-	
+
 	# Be sure to customise these..
 	srcdir => "/path/to/source",
 	destdir => "/var/www/wiki",
-	
+
 	url => "http://example.org/wiki",
 	cgiurl => "http://example.org/ikiwiki.cgi",
 	#templatedir => "/usr/share/ikiwiki/templates",
-	
+	#underlaydir => "/usr/share/ikiwiki/basewiki",
+
 	# Subversion stuff.
 	#rcs => "svn",
 	#historyurl => "http://svn.example.org/trunk/[[file]]",
@@ -58,6 +59,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.
@@ -70,9 +74,7 @@ use IkiWiki::Setup::Standard {
 		#	notify => 1,
 		#},
 	],
-	
-	# Can anonymous web users edit pages?
-	#anonok => 1,
+
 	# Generate rss feeds for blogs?
 	rss => 1,
 	# Generate atom feeds for blogs?
@@ -95,25 +97,27 @@ use IkiWiki::Setup::Standard {
 	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 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",
-	
-	# For use with the search plugin if your estseek.cgi is located 
+
+	# For use with the search plugin if your estseek.cgi is located
 	# somewhere else.
 	#estseek => "/usr/lib/estraier/estseek.cgi",
-	
+
 	# 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",