ikiwiki.setup: Update.

1 files changed, 34 insertions, 27 deletions

diff --git a/ikiwiki.setup b/ikiwiki.setup
index deb1b17d..071df640 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -120,12 +120,14 @@ IkiWiki::Setup::Standard->import({
 
 	######################################################################
 	# core plugins
-	#   (editpage, git, htmlscrubber, inline, link, meta)
+	#   (editpage, git, htmlscrubber, inline, link, meta, parentlinks)
 	######################################################################
 
 	# git plugin
 	# git hook to generate
 	git_wrapper => $git_wrapper,
+	# shell command for git_wrapper to run, in the background
+	#git_wrapper_background_command => 'git push github',
 	# mode for git_wrapper (can safely be made suid)
 	git_wrappermode => '0700',
 	# git pre-receive hook to generate
@@ -189,6 +191,12 @@ IkiWiki::Setup::Standard->import({
 	# PageSpec matching users or comment locations to moderate
 	#moderate_pagespec => '*',
 
+	# openid plugin
+	# url pattern of openid realm (default is cgiurl)
+	#openid_realm => '',
+	# url to ikiwiki cgi to use for openid authentication (default is cgiurl)
+	#openid_cgiurl => '',
+
 	# passwordauth plugin
 	# a password that must be entered when signing up for an account
 	#account_creation_password => 's3cr1t',
@@ -197,40 +205,31 @@ IkiWiki::Setup::Standard->import({
 
 	######################################################################
 	# format plugins
-	#   (creole, highlight, hnb, html, mdwn, otl, po, rawhtml, textile,
-	#    txt)
+	#   (creole, highlight, hnb, html, mdwn, otl, rawhtml, textile, txt)
 	######################################################################
 
 	# highlight plugin
 	# types of source files to syntax highlight
 	#tohighlight => '.c .h .cpp .pl .py Makefile:make',
+	# location of highlight's filetypes.conf
+	#filetypes_conf => '/etc/highlight/filetypes.conf',
+	# location of highlight's langDefs directory
+	#langdefdir => '/usr/share/highlight/langDefs',
 
 	# mdwn plugin
 	# enable multimarkdown features?
 	#multimarkdown => 0,
 
-	# po plugin
-	# master language (non-PO files)
-	#po_master_language => {
-	#  code => 'en',
-	#  name => 'English'
-	#},
-	# slave languages (PO files)
-	#po_slave_languages => {
-	#  de => 'Deutsch',
-	#  es => 'Español',
-	#  fr => 'Français'
-	#},
-	# PageSpec controlling which pages are translatable
-	#po_translatable_pages => '* and !*/Discussion',
-	# internal linking behavior (default/current/negotiated)
-	#po_link_to => 'current',
+	######################################################################
+	# misc plugins
+	#   (filecheck)
+	######################################################################
 
 	######################################################################
 	# web plugins
-	#   (attachment, comments, editdiff, edittemplate, getsource,
-	#    google, mirrorlist, remove, rename, repolist, search,
-	#    websetup, wmd)
+	#   (404, attachment, comments, editdiff, edittemplate, getsource,
+	#    google, goto, mirrorlist, remove, rename, repolist, search,
+	#    theme, websetup, wmd)
 	######################################################################
 
 	# attachment plugin
@@ -269,6 +268,10 @@ IkiWiki::Setup::Standard->import({
 	# path to the omega cgi program
 	#omega_cgi => '/usr/lib/cgi-bin/omega/omega',
 
+	# theme plugin
+	# name of theme to enable
+	#theme => 'actiontabs',
+
 	# websetup plugin
 	# list of plugins that cannot be enabled/disabled via the web interface
 	#websetup_force_plugins => [],
@@ -290,7 +293,7 @@ IkiWiki::Setup::Standard->import({
 	# base of the archives hierarchy
 	#archivebase => 'archives',
 	# PageSpec of pages to include in the archives; used by ikiwiki-calendar command
-	#archive_pagespec => 'posts/* and !*/Discussion',
+	#archive_pagespec => 'page(posts/*) and !*/Discussion',
 
 	# listdirectives plugin
 	# directory in srcdir that contains directive descriptions
@@ -313,10 +316,10 @@ IkiWiki::Setup::Standard->import({
 	######################################################################
 	# other plugins
 	#   (aggregate, autoindex, brokenlinks, camelcase, ddate, embed,
-	#    favicon, goodstuff, htmlbalance, localstyle, pagetemplate,
-	#    pingee, pinger, prettydate, recentchanges, recentchangesdiff,
-	#    relativedate, rsync, sidebar, smiley, sortnaturally, tag,
-	#    testpagespec, underlay)
+	#    favicon, flattr, goodstuff, htmlbalance, localstyle,
+	#    pagetemplate, pingee, pinger, prettydate, recentchanges,
+	#    recentchangesdiff, relativedate, rsync, sidebar, smiley,
+	#    sortnaturally, tag, testpagespec, underlay)
 	######################################################################
 
 	# aggregate plugin
@@ -329,6 +332,10 @@ IkiWiki::Setup::Standard->import({
 	# list of words to not turn into links
 	#camelcase_ignore => [],
 
+	# flattr plugin
+	# userid or user name to use by default for Flattr buttons
+	#flattr_userid => 'joeyh',
+
 	# pinger plugin
 	# how many seconds to try pinging before timing out
 	#pinger_timeout => 15,