Merge branch 'master' of flubber:~hurd-web/hurd-web

1 files changed, 16 insertions, 0 deletions

diff --git a/ikiwiki.setup b/ikiwiki.setup
index aee01480..7a5078f3 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -73,6 +73,8 @@ IkiWiki::Setup::Standard->import({
 	indexpages => 0,
 	# enable Discussion pages?
 	discussion => 1,
+	# name of Discussion pages
+	discussionpage => 'Discussion',
 	# only send cookies over SSL connections?
 	sslcookie => 0,
 	# extension to use for new pages
@@ -188,6 +190,14 @@ IkiWiki::Setup::Standard->import({
 	# darcsweb url to show a diff ([[hash]] and [[file]] substituted)
 	#diffurl => 'http://darcs.example.com/darcsweb.cgi?r=wiki;a=filediff;h=[[hash]];f=[[file]]',
 
+	# getsource plugin
+	# Mime type for returned source.
+	#getsource_mimetype => 'text/plain; charset=utf-8',
+
+	# highlight plugin
+	# types of source files to syntax highlight
+	#tohighlight => '.c .h .cpp .pl .py Makefile:make',
+
 	# htmlscrubber plugin
 	# PageSpec specifying pages not to scrub
 	#htmlscrubber_skip => '!*/Discussion',
@@ -258,6 +268,10 @@ IkiWiki::Setup::Standard->import({
 	# URIs of repositories containing the wiki's source
 	#repositories => [qw{svn://svn.example.org/wiki/trunk}],
 
+	# rsync plugin
+	# command to run to sync updated pages
+	#rsync_command => 'rsync -qa --delete . user@host:/path/to/docroot/',
+
 	# search plugin
 	# path to the omega cgi program
 	#omega_cgi => '/usr/lib/cgi-bin/omega/omega',
@@ -307,6 +321,8 @@ IkiWiki::Setup::Standard->import({
 	# underlay plugin
 	# extra underlay directories to add
 	#add_underlays => '',
+	# extra template directories to add
+	#add_templates => '',
 
 	# websetup plugin
 	# list of plugins that cannot be enabled/disabled via the web interface