Update to ikiwiki b10d353490197b576ef7bf2e8bf8016039efbd2d.

6 files changed, 315 insertions, 223 deletions

diff --git a/.templates/editpage.tmpl b/.templates/editpage.tmpl
index 45060ffe..53ce934e 100644
--- a/.templates/editpage.tmpl
+++ b/.templates/editpage.tmpl
@@ -1,4 +1,3 @@
-<br />
 <TMPL_VAR JAVASCRIPT>
 <TMPL_VAR MESSAGE>
 <TMPL_VAR FORM-START>
@@ -7,19 +6,26 @@
 <TMPL_VAR FIELD-FROM>
 <TMPL_VAR FIELD-RCSINFO>
 <TMPL_VAR FIELD-NEWFILE>
+<ol class="form">
 <TMPL_IF NAME="PAGE_SELECT">
-Page location: <TMPL_VAR FIELD-PAGE>
-Page type: <TMPL_VAR FIELD-TYPE>
+<li>
+<label for="page" class="inline">Page location:</label><TMPL_VAR FIELD-PAGE>
+<label for="type" class="inline">Page type:</label><TMPL_VAR FIELD-TYPE>
+</li>
 <TMPL_ELSE>
-<br />
 <TMPL_VAR FIELD-PAGE>
 <TMPL_VAR FIELD-TYPE>
 </TMPL_IF>
+<li>
 <TMPL_VAR FIELD-EDITCONTENT><br />
+</li>
 <TMPL_IF NAME="CAN_COMMIT">
-Optional comment about this change:<br />
+<li>
+<label for="comments" class="block">Optional comment about this change:</label>
 <TMPL_VAR FIELD-COMMENTS><br />
+</li>
 </TMPL_IF>
+</ol>
 
 <div class="copyright_assignment_notice">
 
@@ -66,3 +72,12 @@ if there are questions.</p>
 <TMPL_VAR PAGE_PREVIEW>
 </div>
 </TMPL_IF>
+<TMPL_IF NAME="PAGE_DIFF">
+<hr />
+<div class="header">
+<span>Diff:</span>
+</div>
+<div id="diff">
+<TMPL_VAR PAGE_DIFF>
+</div>
+</TMPL_IF>
diff --git a/.templates/newsitem.tmpl b/.templates/newsitem.tmpl
index 1c8f2ae8..3b4fded1 100644
--- a/.templates/newsitem.tmpl
+++ b/.templates/newsitem.tmpl
@@ -1,59 +1,61 @@
-<div class="newsitem">
+<TMPL_IF HTML5><article class="newsitem"><TMPL_ELSE><div class="newsitem"></TMPL_IF>
 
-<div class="newsitemheader">
-
-<TMPL_IF NAME="AUTHOR">
+<TMPL_IF HTML5><section class="newsitemheader"><TMPL_ELSE><div class="newsitemheader"></TMPL_IF>
+<TMPL_IF AUTHOR>
 <span class="author">
-<TMPL_IF NAME="AUTHORURL">
+<TMPL_IF AUTHORURL>
 <a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
 <TMPL_ELSE>
 <TMPL_VAR AUTHOR>
 </TMPL_IF>
 </span>
 </TMPL_IF>
-<span class="header">
-<TMPL_IF NAME="PERMALINK">
+<TMPL_IF HTML5><header class="header"><TMPL_ELSE><span class="header"></TMPL_IF>
+<TMPL_IF PERMALINK>
 <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
 <TMPL_ELSE>
 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
 </TMPL_IF>
-</span>
-<TMPL_IF NAME="HAVE_ACTIONS">
-<div class="actions">
+<TMPL_IF HTML5></header><TMPL_ELSE></span></TMPL_IF>
+
+<TMPL_IF HAVE_ACTIONS>
+<TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
 <ul>
-<TMPL_IF NAME="EDITURL">
+<TMPL_IF EDITURL>
 <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="DISCUSSIONLINK">
+<TMPL_IF COMMENTSLINK>
+<li><TMPL_VAR COMMENTSLINK></li>
+<TMPL_ELSE>
+<TMPL_IF DISCUSSIONLINK>
 <li><TMPL_VAR DISCUSSIONLINK></li>
 </TMPL_IF>
+</TMPL_IF>
 </ul>
-</div><!--.actions-->
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-</div><!--.newsitemheader-->
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
-<div class="newsitemcontent">
+<TMPL_IF HTML5><section class="newsitemcontent"><TMPL_ELSE><div class="newsitemcontent"></TMPL_IF>
 <TMPL_VAR CONTENT>
-</div><!--.newsitemcontent-->
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
-<div class="newsitemfooter">
+<TMPL_IF HTML5><footer class="newsitemfooter"><TMPL_ELSE><div class="newsitemfooter"></TMPL_IF>
 
 <!-- The saved space is more important that the information this provides.
-
 <span class="pagedate">
 Posted <TMPL_VAR CTIME>
 </span>
-
 -->
 
-<TMPL_IF NAME="TAGS">
-<span class="tags">
+<TMPL_IF TAGS>
+<TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><span class="tags"></TMPL_IF>
 Tags:
-<TMPL_LOOP NAME="TAGS">
+<TMPL_LOOP TAGS>
 <TMPL_VAR LINK>
 </TMPL_LOOP>
-</span>
+<TMPL_IF HTML5></nav><TMPL_ELSE></span></TMPL_IF>
 </TMPL_IF>
 
 <!-- For these tiny snippets we can abstain from displaying this again.  It
@@ -73,6 +75,6 @@ License: <TMPL_VAR LICENSE>
 
 -->
 
-</div><!--.newsitemfooter-->
+<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
 
-</div><!--.newsitem-->
+<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
diff --git a/.templates/page.tmpl b/.templates/page.tmpl
index d546a88f..45d28697 100644
--- a/.templates/page.tmpl
+++ b/.templates/page.tmpl
@@ -1,85 +1,129 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+<TMPL_IF HTML5><!DOCTYPE html>
+<html>
+<TMPL_ELSE><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+</TMPL_IF>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<TMPL_IF DYNAMIC>
+<TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
+<TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
+</TMPL_IF>
+</TMPL_IF>
+<TMPL_IF HTML5><meta charset="utf-8" /><TMPL_ELSE><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></TMPL_IF>
+<meta http-equiv="Cache-Control" content="must-revalidate" />
 <title><TMPL_VAR TITLE></title>
-<TMPL_IF NAME="FAVICON">
+<TMPL_IF FAVICON>
 <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
 </TMPL_IF>
 <link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
+<TMPL_IF LOCAL_CSS>
+<link rel="stylesheet" href="<TMPL_VAR BASEURL><TMPL_VAR LOCAL_CSS>" type="text/css" />
+<TMPL_ELSE>
 <link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
-<TMPL_IF NAME="EDITURL">
+</TMPL_IF>
+<TMPL_IF EDITURL>
 <link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
 </TMPL_IF>
-<TMPL_IF NAME="FEEDLINKS"><TMPL_VAR FEEDLINKS></TMPL_IF>
-<TMPL_IF NAME="RELVCS"><TMPL_VAR RELVCS></TMPL_IF>
-<TMPL_IF NAME="META"><TMPL_VAR META></TMPL_IF>
+<TMPL_IF FEEDLINKS><TMPL_VAR FEEDLINKS></TMPL_IF>
+<TMPL_IF RELVCS><TMPL_VAR RELVCS></TMPL_IF>
+<TMPL_IF META><TMPL_VAR META></TMPL_IF>
 </head>
 <body>
 
-<div class="pageheader">
-<div class="header">
+<TMPL_IF HTML5><article class="page"><TMPL_ELSE><div class="page"></TMPL_IF>
+
+<TMPL_IF HTML5><section class="pageheader"><TMPL_ELSE><div class="pageheader"></TMPL_IF>
+<TMPL_IF HTML5><header class="header"><TMPL_ELSE><div class="header"></TMPL_IF>
 <span>
 <span class="parentlinks">
-<TMPL_LOOP NAME="PARENTLINKS">
+<TMPL_LOOP PARENTLINKS>
 <a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>/ 
 </TMPL_LOOP>
 </span>
 <span class="title">
 <TMPL_VAR TITLE>
+<TMPL_IF ISTRANSLATION>
+&nbsp;(<TMPL_VAR PERCENTTRANSLATED>%)
+</TMPL_IF>
 </span>
-</span><!--.header-->
-<TMPL_IF NAME="SEARCHFORM">
+</span>
+<TMPL_IF SEARCHFORM>
 <TMPL_VAR SEARCHFORM>
 </TMPL_IF>
-</div>
+<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
-<TMPL_IF NAME="HAVE_ACTIONS">
-<div class="actions">
+<TMPL_IF HAVE_ACTIONS>
+<TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
 <span class="global">
 <ul>
-<TMPL_IF NAME="RECENTCHANGESURL">
+<TMPL_IF RECENTCHANGESURL>
 <li><a href="<TMPL_VAR RECENTCHANGESURL>">Recent Changes</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="PREFSURL">
+<TMPL_IF PREFSURL>
 <li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li>
 </TMPL_IF>
 </ul>
 </span>
 <span class="per_page">
 <ul>
-<TMPL_IF NAME="EDITURL">
+<TMPL_IF EDITURL>
 <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="HISTORYURL">
+<TMPL_IF HISTORYURL>
 <li><a href="<TMPL_VAR HISTORYURL>">History</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="COMMENTSLINK">
-<li><TMPL_VAR COMMENTSLINK><br /></li>
+<TMPL_IF GETSOURCEURL>
+<li><a href="<TMPL_VAR GETSOURCEURL>">Source</a></li>
+</TMPL_IF>
+<TMPL_IF ACTIONS>
+<TMPL_LOOP ACTIONS>
+<li><TMPL_VAR ACTION></li>
+</TMPL_LOOP>
+</TMPL_IF>
+<TMPL_IF COMMENTSLINK>
+<li><TMPL_VAR COMMENTSLINK></li>
 <TMPL_ELSE>
-<TMPL_IF NAME="DISCUSSIONLINK">
-<li><TMPL_VAR DISCUSSIONLINK><br /></li>
+<TMPL_IF DISCUSSIONLINK>
+<li><TMPL_VAR DISCUSSIONLINK></li>
 </TMPL_IF>
 </TMPL_IF>
 </ul>
 </span>
-</div>
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
-</div> <!-- .pageheader -->
+
+<TMPL_IF OTHERLANGUAGES>
+<TMPL_IF HTML5><nav id="otherlanguages"><TMPL_ELSE><div id="otherlanguages"></TMPL_IF>
+<ul>
+<TMPL_LOOP OTHERLANGUAGES>
+<li>
+<a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a>
+<TMPL_IF MASTER>
+(master)
+<TMPL_ELSE>
+&nbsp;(<TMPL_VAR PERCENT>%)
+</TMPL_IF>
+</li>
+</TMPL_LOOP>
+</ul>
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
+
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF SIDEBAR>
-<div id="sidebar">
+<TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
 <TMPL_VAR SIDEBAR>
-</div>
+<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-<div id="content">
+<TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF>
 <TMPL_VAR CONTENT>
-</div>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF COMMENTS>
-<div id="comments">
+<TMPL_IF HTML5><section id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF>
 <TMPL_VAR COMMENTS>
 <TMPL_IF ADDCOMMENTURL>
 <div class="addcomment">
@@ -88,37 +132,38 @@
 <TMPL_ELSE>
 <div class="addcomment">Comments on this page are closed.</div>
 </TMPL_IF>
-</div>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-<div id="footer" class="pagefooter">
-<div id="pageinfo">
+<TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
+<TMPL_UNLESS DYNAMIC>
+<TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
 
-<TMPL_IF NAME="TAGS">
-<div class="tags">
+<TMPL_IF TAGS>
+<TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><div class="tags"></TMPL_IF>
 Tags:
-<TMPL_LOOP NAME="TAGS">
+<TMPL_LOOP TAGS>
 <TMPL_VAR LINK>
 </TMPL_LOOP>
-</div>
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-<TMPL_IF NAME="BACKLINKS">
-<div id="backlinks">
+<TMPL_IF BACKLINKS>
+<TMPL_IF HTML5><nav id="backlinks"><TMPL_ELSE><div id="backlinks"></TMPL_IF>
 Links:
-<TMPL_LOOP NAME="BACKLINKS">
+<TMPL_LOOP BACKLINKS>
 <a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
 </TMPL_LOOP>
-<TMPL_IF NAME="MORE_BACKLINKS">
+<TMPL_IF MORE_BACKLINKS>
 <span class="popup">...
 <span class="balloon">
-<TMPL_LOOP NAME="MORE_BACKLINKS">
+<TMPL_LOOP MORE_BACKLINKS>
 <a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
 </TMPL_LOOP>
 </span>
 </span>
 </TMPL_IF>
-</div><!-- #backlinks -->
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
 <TMPL_IF COPYRIGHT>
@@ -140,10 +185,13 @@ Last edited <TMPL_VAR MTIME>
 <!-- Created <TMPL_VAR CTIME> -->
 </div>
 
-</div><!-- #pageinfo -->
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
+</TMPL_UNLESS>
 <!-- from <TMPL_VAR WIKINAME> -->
-</div><!-- .pagefooter #footer -->
+<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
+
+<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
 
 </body>
 </html>
diff --git a/ikiwiki.setup b/ikiwiki.setup
index eb31a420..89130e2b 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -1,9 +1,10 @@
 #!/usr/bin/perl
-# Setup file for ikiwiki.
 #
+# Setup file for ikiwiki.
+# 
 # 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.
 
 require IkiWiki::Setup::Standard;
@@ -59,7 +60,7 @@ IkiWiki::Setup::Standard->import({
 	add_plugins => [qw{goodstuff cutpaste editdiff edittemplate favicon html sidebar table txt copyright license texinfo}],
 	# plugins to disable
 	disable_plugins => [],
-	# location of template files
+	# additional directory to search for template files
 	templatedir => $srcdir.'/.templates',
 	# base wiki source location
 	#underlaydir => '/usr/share/ikiwiki/basewiki',
@@ -77,6 +78,8 @@ IkiWiki::Setup::Standard->import({
 	discussion => 1,
 	# name of Discussion pages
 	discussionpage => 'Discussion',
+	# generate HTML5? (experimental)
+	html5 => 0,
 	# only send cookies over SSL connections?
 	sslcookie => 0,
 	# extension to use for new pages
@@ -101,13 +104,20 @@ IkiWiki::Setup::Standard->import({
 	libdir => $srcdir.'/.library',
 	# environment variables
 	ENV => {},
-	# regexp of source files to ignore
-	#exclude => '\\.wav$',
+	# regexp of normally excluded files to include
+	#include => '^\\.htaccess$',
+	# regexp of files that should be skipped
+	#exclude => '^(*\\.private|Makefile)$',
 	# specifies the characters that are allowed in source filenames
 	wiki_file_chars => '-[:alnum:]+/.:_',
 	# allow symlinks in the path leading to the srcdir (potentially insecure)
 	#allow_symlinks_before_srcdir => 0,
 
+	######################################################################
+	# core plugins
+	#   (editpage, git, htmlscrubber, inline, link, meta)
+	######################################################################
+
 	# git plugin
 	# git hook to generate
 	git_wrapper => $git_wrapper,
@@ -126,22 +136,32 @@ IkiWiki::Setup::Standard->import({
 	# branch that the wiki is stored in
 	gitmaster_branch => 'master',
 
-	# aggregate plugin
-	# enable aggregation to internal pages?
-	#aggregateinternal => 1,
-	# allow aggregation to be triggered via the web?
-	#aggregate_webtrigger => 0,
+	# htmlscrubber plugin
+	# PageSpec specifying pages not to scrub
+	#htmlscrubber_skip => '!*/Discussion',
+
+	# inline plugin
+	# enable rss feeds by default?
+	rss => 1,
+	# enable atom feeds by default?
+	atom => 1,
+	# allow rss feeds to be used?
+	#allowrss => 0,
+	# allow atom feeds to be used?
+	#allowatom => 0,
+	# urls to ping (using XML-RPC) on feed update
+	pingurl => [],
+
+	######################################################################
+	# auth plugins
+	#   (anonok, blogspam, httpauth, lockedit, moderatedcomments,
+	#    opendiscussion, openid, passwordauth, signinedit)
+	######################################################################
 
 	# anonok plugin
 	# PageSpec to limit which pages anonymous users can edit
 	#anonok_pagespec => '*/discussion',
 
-	# attachment plugin
-	# enhanced PageSpec specifying what attachments are allowed
-	#allowed_attachments => 'virusfree() and mimetype(image/*) and maxsize(50kb)',
-	# virus checker program (reads STDIN, returns nonzero if virus found)
-	#virus_checker => 'clamdscan -',
-
 	# blogspam plugin
 	# PageSpec of pages to check for spam
 	#blogspam_pagespec => 'postcomment(*)',
@@ -150,23 +170,69 @@ IkiWiki::Setup::Standard->import({
 	# blogspam server XML-RPC url
 	#blogspam_server => '',
 
-	# bzr plugin
-	# bzr post-commit hook to generate
-	#bzr_wrapper => '',
-	# mode for bzr_wrapper (can safely be made suid)
-	#bzr_wrappermode => '06755',
-	# url to show file history, using loggerhead ([[file]] substituted)
-	#historyurl => '',
-	# url to view a diff, using loggerhead ([[file]] and [[r2]] substituted)
-	#diffurl => 'http://example.com/revision?start_revid=[[r2]]#[[file]]-s',
+	# httpauth plugin
+	# url to redirect to when authentication is needed
+	#cgiauthurl => 'http://example.com/wiki/auth/ikiwiki.cgi',
+	# PageSpec of pages where only httpauth will be used for authentication
+	#httpauth_pagespec => '!*/Discussion',
 
-	# calendar plugin
-	# base of the archives hierarchy
-	#archivebase => 'archives',
+	# lockedit plugin
+	# PageSpec controlling which pages are locked
+	#locked_pages => '!*/Discussion',
 
-	# camelcase plugin
-	# list of words to not turn into links
-	#camelcase_ignore => [],
+	# moderatedcomments plugin
+	# PageSpec matching users or comment locations to moderate
+	#moderate_pagespec => '*',
+
+	# passwordauth plugin
+	# a password that must be entered when signing up for an account
+	#account_creation_password => 's3cr1t',
+	# cost of generating a password using Authen::Passphrase::BlowfishCrypt
+	#password_cost => 8,
+
+	######################################################################
+	# format plugins
+	#   (creole, highlight, hnb, html, mdwn, otl, po, rawhtml, textile,
+	#    txt)
+	######################################################################
+
+	# highlight plugin
+	# types of source files to syntax highlight
+	#tohighlight => '.c .h .cpp .pl .py Makefile:make',
+
+	# 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',
+
+	######################################################################
+	# web plugins
+	#   (attachment, comments, editdiff, edittemplate, getsource,
+	#    google, mirrorlist, remove, rename, repolist, search,
+	#    websetup, wmd)
+	######################################################################
+
+	# attachment plugin
+	# enhanced PageSpec specifying what attachments are allowed
+	#allowed_attachments => 'virusfree() and mimetype(image/*) and maxsize(50kb)',
+	# virus checker program (reads STDIN, returns nonzero if virus found)
+	#virus_checker => 'clamdscan -',
 
 	# comments plugin
 	# PageSpec of pages where comments are allowed
@@ -182,75 +248,81 @@ IkiWiki::Setup::Standard->import({
 	# commit comments to the VCS
 	#comments_commit => 1,
 
-	# darcs plugin
-	# wrapper to generate (set as master repo apply hook)
-	#darcs_wrapper => '/darcs/repo/_darcs/ikiwiki-wrapper',
-	# mode for darcs_wrapper (can safely be made suid)
-	#darcs_wrappermode => '06755',
-	# darcsweb url to show file history ([[file]] substituted)
-	#historyurl => 'http://darcs.example.com/darcsweb.cgi?r=wiki;a=filehistory;f=[[file]]',
-	# 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',
+	# mirrorlist plugin
+	# list of mirrors
+	#mirrorlist => {},
 
-	# htmlscrubber plugin
-	# PageSpec specifying pages not to scrub
-	#htmlscrubber_skip => '!*/Discussion',
+	# repolist plugin
+	# URIs of repositories containing the wiki's source
+	#repositories => [qw{svn://svn.example.org/wiki/trunk}],
 
-	# inline plugin
-	# enable rss feeds by default?
-	rss => 1,
-	# enable atom feeds by default?
-	atom => 1,
-	# allow rss feeds to be used?
-	#allowrss => 0,
-	# allow atom feeds to be used?
-	#allowatom => 0,
-	# urls to ping (using XML-RPC) on feed update
-	pingurl => [],
+	# search plugin
+	# path to the omega cgi program
+	#omega_cgi => '/usr/lib/cgi-bin/omega/omega',
+
+	# websetup plugin
+	# list of plugins that cannot be enabled/disabled via the web interface
+	#websetup_force_plugins => [],
+	# list of additional setup field keys to treat as unsafe
+	#websetup_unsafe => [],
+	# show unsafe settings, read-only, in web interface?
+	#websetup_show_unsafe => 1,
+
+	######################################################################
+	# widget plugins
+	#   (calendar, color, conditional, cutpaste, date, format, fortune,
+	#    graphviz, haiku, img, linkmap, listdirectives, map, more,
+	#    orphans, pagecount, pagestats, poll, polygen, postsparkline,
+	#    progress, shortcut, sparkline, table, template, teximg, toc,
+	#    toggle, version)
+	######################################################################
+
+	# calendar plugin
+	# 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',
 
 	# listdirectives plugin
 	# directory in srcdir that contains directive descriptions
 	#directive_description_dir => 'ikiwiki/directive',
 
-	# lockedit plugin
-	# PageSpec controlling which pages are locked
-	#locked_pages => '!*/Discussion',
-
-	# mdwn plugin
-	# enable multimarkdown features?
-	#multimarkdown => 0,
-
-	# mercurial plugin
-	# mercurial post-commit hook to generate
-	#mercurial_wrapper => '',
-	# mode for mercurial_wrapper (can safely be made suid)
-	#mercurial_wrappermode => '06755',
-	# url to hg serve'd repository, to show file history ([[file]] substituted)
-	#historyurl => 'http://example.com:8000/log/tip/[[file]]',
-	# url to hg serve'd repository, to show diff ([[file]] and [[r2]] substituted)
-	#diffurl => 'http://localhost:8000/?fd=[[r2]];file=[[file]]',
+	# teximg plugin
+	# Should teximg use dvipng to render, or dvips and convert?
+	#teximg_dvipng => '',
+	# LaTeX prefix for teximg plugin
+	#teximg_prefix => '\\documentclass{article}
+	#\\usepackage{amsmath}
+	#\\usepackage{amsfonts}
+	#\\usepackage{amssymb}
+	#\\pagestyle{empty}
+	#\\begin{document}
+	#',
+	# LaTeX postfix for teximg plugin
+	#teximg_postfix => '\\end{document}',
 
-	# mirrorlist plugin
-	# list of mirrors
-	#mirrorlist => {},
+	######################################################################
+	# 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)
+	######################################################################
 
-	# openid plugin
-	# an url where users can signup for an OpenID
-	#openidsignup => 'http://myopenid.com/',
+	# aggregate plugin
+	# enable aggregation to internal pages?
+	#aggregateinternal => 1,
+	# allow aggregation to be triggered via the web?
+	#aggregate_webtrigger => 0,
 
-	# passwordauth plugin
-	# a password that must be entered when signing up for an account
-	#account_creation_password => 's3cr1t',
-	# cost of generating a password using Authen::Passphrase::BlowfishCrypt
-	#password_cost => 8,
+	# camelcase plugin
+	# list of words to not turn into links
+	#camelcase_ignore => [],
 
 	# pinger plugin
 	# how many seconds to try pinging before timing out
@@ -266,69 +338,21 @@ IkiWiki::Setup::Standard->import({
 	# number of changes to track
 	recentchangesnum => 100,
 
-	# repolist plugin
-	# 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',
-
-	# svn plugin
-	# subversion repository location
-	#svnrepo => '/svn/wiki',
-	# path inside repository where the wiki is located
-	#svnpath => 'trunk',
-	# svn post-commit hook to generate
-	#svn_wrapper => '/svn/wikirepo/hooks/post-commit',
-	# mode for svn_wrapper (can safely be made suid)
-	#svn_wrappermode => '04755',
-	# viewvc url to show file history ([[file]] substituted)
-	#historyurl => 'http://svn.example.org/trunk/[[file]]',
-	# viewvc url to show a diff ([[file]], [[r1]], and [[r2]] substituted)
-	#diffurl => 'http://svn.example.org/trunk/[[file]]?root=wiki&amp;r1=[[r1]]&amp;r2=[[r2]]',
+	# sidebar plugin
+	# show sidebar page on all pages?
+	#global_sidebars => 1,
 
 	# tag plugin
 	# parent page tags are located under
 	tagbase => 'tag',
-
-	# teximg plugin
-	# Should teximg use dvipng to render, or dvips and convert?
-	#teximg_dvipng => '',
-	# LaTeX prefix for teximg plugin
-	#teximg_prefix => '\\documentclass{article}
-	#\\usepackage{amsmath}
-	#\\usepackage{amsfonts}
-	#\\usepackage{amssymb}
-	#\\pagestyle{empty}
-	#\\begin{document}
-	#',
-	# LaTeX postfix for teximg plugin
-	#teximg_postfix => '\\end{document}',
-
-	# tla plugin
-	# tla post-commit hook to generate
-	#tla_wrapper => '',
-	# mode for tla_wrapper (can safely be made suid)
-	#tla_wrappermode => '06755',
-	# url to show file history ([[file]] substituted)
-	#historyurl => '',
-	# url to show a diff ([[file]] and [[rev]] substituted)
-	#diffurl => '',
+	# autocreate new tag pages?
+	#tag_autocreate => 1,
 
 	# 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
-	#websetup_force_plugins => [],
-	# show unsafe settings, read-only, in web interface?
-	#websetup_show_unsafe => 1,
 })
diff --git a/local.css b/local.css
index a275bc07..d705f3b4 100644
--- a/local.css
+++ b/local.css
@@ -1,6 +1,6 @@
 /* ikiwiki local style sheet
 
-   Copyright © 2007, 2008, 2009 Free Software Foundation, Inc.
+   Copyright © 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document under
    the terms of the GNU Free Documentation License, Version 1.2 or any later
@@ -138,7 +138,7 @@ a:hover
   padding: 0.5em;
 }
 
-#sidebar
+.sidebar
 {
   background-color: #f0f0f0;
 }
@@ -159,25 +159,24 @@ a:hover
 }
 
 
-/* Variable width.  */
-#sidebar
+/* Placement.  */
+.sidebar
 {
   width: auto;
-  /* ikiwiki's default for `width'.  */
-  min-width: 20ex;
+  margin-left: 20px;
 }
 
 /* Less indentation for list items.  */
-#sidebar ul
+.sidebar ul
 {
   padding-left: 2ex;
 }
-#sidebar ul ul
+.sidebar ul ul
 {
   padding-left: 2.5ex;
 }
 /* Make the logo appear centered */
-#sidebar img {
+.sidebar img {
 	display: block;
 	margin-left: auto;
 	margin-right: auto;
diff --git a/render_locally b/render_locally
index f4a249a8..9e257560 100755
--- a/render_locally
+++ b/render_locally
@@ -20,10 +20,14 @@ case $1 in
     export DESTDIR && DESTDIR=$ROOT.rendered.official &&
     # Use ``--no-usedirs'' here, so that not too many separate directories have
     # to be created.
+    #
+    # ``--gettime --rebuild'':
+    # <http://ikiwiki.info/bugs/pagemtime_in_refresh_mode/>
     set x \
       --set wikistatedir="$ROOT"/.ikiwiki-official \
       --url http://www.gnu.org/software/hurd \
       --no-usedirs \
+      --gettime --rebuild \
       "$@" &&
     shift;;
   --w3m-wrapper)